Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

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

@@ -261,8 +261,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         UMConfigUtils.onProfileSignIn();
         try {
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-            SpUtils.savePhone(activity, userEntity.getMobile());
-            SpUtils.saveWeixin(activity, userEntity.getWx_nickname());
 
 //            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -72,8 +72,6 @@ public class LoginPresenter implements LoginContract.Presenter {
                                 LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
                                 SpUtils.login(SheepApp.mContext, loginEty.getToken());
                                 try {
-                                    SpUtils.savePhone(SheepApp.mContext, loginEty.getUser().getMobile());
-                                    SpUtils.saveWeixin(SheepApp.mContext, loginEty.getUser().getWx_nickname());
                                     MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
                                 } catch (DbException e) {
                                     e.printStackTrace();
@@ -102,8 +100,6 @@ public class LoginPresenter implements LoginContract.Presenter {
                                 LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
                                 SpUtils.login(SheepApp.mContext, loginEty.getToken());
                                 try {
-                                    SpUtils.savePhone(SheepApp.mContext, loginEty.getUser().getMobile());
-                                    SpUtils.saveWeixin(SheepApp.mContext, loginEty.getUser().getWx_nickname());
                                     MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
                                 } catch (DbException e) {
                                     e.printStackTrace();

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

@@ -4,7 +4,9 @@ import android.os.Handler;
 
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.xutils.DbManager;
 import org.xutils.ex.DbException;
@@ -45,16 +47,18 @@ public class MyDbManager {
     public void saveOrUpdateUser(final UserEntity user) throws DbException {
         if(user != null){
             deleteTable(UserEntity.class);//先清空表
-            db.saveOrUpdate(user);
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     try {
+                        db.saveOrUpdate(user);
+                        SpUtils.savePhone(SheepApp.mContext, user.getMobile());
+                        SpUtils.saveWeixin(SheepApp.mContext, user.getWx_openid());
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
-            }, 2000);
+            }, 500);
 
         }
 

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

@@ -293,7 +293,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 //Todo user 类都没有统一，先这样
                 try{
                     MyDbManager.getInstance()
-                            .saveOrUpdateUser(userEntity);
+                            .saveOrUpdateUser(mEntity);
                 }catch (Exception e){
                     e.printStackTrace();
                 }

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

@@ -130,6 +130,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
                 .endActivity(ChangeWxOrTelAct.class);
         finish();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
+        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));
     }
 
     @Override
@@ -137,4 +138,9 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         hideProgress();
         G.showToast(((BaseMessage)o).getMsg()+ "");
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
 }

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

@@ -280,6 +280,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         }else if(task_entity.getTask_type() == 2){//信用卡业务
             type = 4;
             buttonStr = CommonUtil.START_TASK;
+            dialogItemSizeTv.setVisibility(View.INVISIBLE);
         }
         else{
             //Todo 以后整理，现在加了个type=3

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

@@ -139,8 +139,6 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
         try {
-            SpUtils.savePhone(activity, userEntity.getMobile());
-            SpUtils.saveWeixin(activity, userEntity.getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
 //            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");

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

@@ -145,8 +145,6 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
         userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
 
         try {
-            SpUtils.savePhone(SheepApp.mContext, userEntity.getMobile());
-            SpUtils.saveWeixin(SheepApp.mContext, userEntity.getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
             UserEntity userEntitys = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");

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

@@ -248,8 +248,6 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         LoginEntity loginEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
         SpUtils.login(activity, loginEty.getToken());
         try {
-            SpUtils.savePhone(activity, loginEty.getUser().getMobile());
-            SpUtils.saveWeixin(activity, loginEty.getUser().getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
@@ -364,8 +362,6 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             LoginEntity loginEty = JSON.parseObject(a.get("data").toString(), LoginEntity.class);
             SpUtils.login(activity, loginEty.getToken());
             try {
-                SpUtils.savePhone(SheepApp.mContext, loginEty.getUser().getMobile());
-                SpUtils.saveWeixin(SheepApp.mContext, loginEty.getUser().getWx_nickname());
                 MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
                 UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
                 Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");

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

@@ -88,7 +88,7 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
 //
 //            }else {
 //            }
-            mHandler.sendEmptyMessageDelayed(0, 1000);
+            mHandler.sendEmptyMessageDelayed(0, 5000);
         }
     }
 

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

@@ -4,11 +4,13 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
@@ -17,6 +19,7 @@ import com.sheep.gamegroup.di.modules.WithdrawalModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.WithdrawalContract;
 import com.sheep.gamegroup.presenter.WithdrawalPresenter;
 import com.sheep.gamegroup.util.Jump2View;
@@ -30,6 +33,7 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 import org.xutils.ex.DbException;
 
 import java.util.ArrayList;
@@ -40,6 +44,9 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import rx.Scheduler;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * 提现
@@ -69,6 +76,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private String balanceAmount = "0";//余额
 
     private boolean isFinishFirstWithdrawal;//是否完成首次提现任务
+
+    private  UserEntity userEntity;
     @Override
     protected int getLayoutId() {
         return R.layout.withdrawal_layout;
@@ -77,6 +86,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void initView() {
         activity = this;
+        EventBus.getDefault().register(this);
         isFinishFirstWithdrawal = getIntent().getBooleanExtra(Boolean.class.getSimpleName(), true);
         TitleBarUtils
                 .getInstance()
@@ -122,7 +132,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void initData() {
 
         try {
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
+            userEntity = MyDbManager.getInstance().dbFindUser();
             if(userEntity != null){
                 weixin_name_tv.setText(userEntity.getWx_nickname() +"");
             }
@@ -238,4 +248,52 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
     }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case REFRESH_DATA_PHONE:
+                refreshData();
+                break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+    //Todo 刷新用户信息,可以写一个公用的
+    /**
+     * 刷新用户信息
+     */
+    private void refreshData(){
+        showProgress(false);
+        SheepApp.get(this)
+                .getNetComponent()
+                .getApiService()
+                .getInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        hideProgress();
+                        G.showToast(""+baseMessage.getMsg());
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        hideProgress();
+                        userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+                        try {
+                            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+                            initData();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
 }