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

# Conflicts:
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

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

@@ -37,6 +37,7 @@ import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
@@ -59,6 +60,7 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.xutils.ex.DbException;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -206,6 +208,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if(views.size() < 1 ){
             pagePresenter.getAwardDetail();
         }
+
         initWechatIsOpen();
 
     }
@@ -215,25 +218,25 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      */
     private void initWechatIsOpen() {
         SheepApp.getInstance().getNetComponent().getApiService().getWebchatIsOpen()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
-                                if(baseMessage.getData() instanceof Boolean)
-                                    wechatIsOpen = (Boolean) baseMessage.getData();
-                                else
-                                    wechatIsOpen = false;
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                        if(baseMessage.getData() instanceof Boolean)
+                            wechatIsOpen = (Boolean) baseMessage.getData();
+                        else
+                            wechatIsOpen = false;
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                    }
+                });
     }
 
     @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task})
@@ -270,13 +273,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.newbie_task://新手任务
                 if(userEntity == null){
+                    G.showToast("网络错误，请重启重试");
                     return;
                 }
-                Jump2View.getInstance().goNewbieTaskList(activity, null);
+                Jump2View.getInstance().goNewbieTaskList(activity, newbie_task_record);
                 break;
         }
     }
-
+    private NewbieTaskRecord newbie_task_record;
     @Override
     public void updateData2View(Object o) {
         if (o == null) {
@@ -290,8 +294,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() + "");
@@ -306,42 +308,53 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .preload(800, 800);
         if(userEntity.getNewbie_task_status() < 15){//为15时代表已经完成所有新手任务，不是新手
             newbie_task.setVisibility(View.VISIBLE);
-            boolean dontShowNewbieTaskDialog = SharedPreferences.getInstance().getBoolean("dontShowNewbieTaskDialog", false);//默认可以显示对话框
+            try {
+                newbie_task_record = MyDbManager.getInstance().dbFindNewbieTaskRecord(userEntity.getInvitation_code());
+            } catch (DbException e) {
+                e.printStackTrace();
+            }
+            if(newbie_task_record == null){
+                newbie_task_record = new NewbieTaskRecord();
+                newbie_task_record.setUser_id(userEntity.getInvitation_code());
+                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
+            }
+            boolean dontShowNewbieTaskDialog = newbie_task_record != null && newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
             if(dontShowNewbieTaskDialog){
                 return;
             }
             SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                                @Override
-                                public void onNext(BaseMessage baseMessage) {
-                                    List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
-                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),0, 0)){//第一个任务未完成
-                                        DialogNewbieTaskRegistSuccess.showDialog(getActivity());
-                                    } else if(newbieTaskList != null && !newbieTaskList.isEmpty()){
-                                        SharedPreferences.getInstance().putBoolean("dontShowNewbieTaskDialog", true);//设置为不再显示新手对话框
-                                        List<NewbieTask> taskList = new ArrayList<>();
-                                        NewbieTask task = null;
-                                        for (NewbieTask newbieTask : newbieTaskList) {
-                                            if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
-                                                taskList.add(newbieTask);
-                                            } else {
-                                                task = newbieTask;
-                                            }
-                                        }
-                                        DialogNewbieTask1.showDialog(getActivity(), taskList, task);
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                            List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                            if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),0, 0)){//第一个任务未完成
+                                DialogNewbieTaskRegistSuccess.showDialog(getActivity(), newbie_task_record);
+                            } else if(newbieTaskList != null && !newbieTaskList.isEmpty()){
+                                newbie_task_record.setDontShowNewbieTaskDialog(true);
+                                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
+                                List<NewbieTask> taskList = new ArrayList<>();
+                                NewbieTask task = null;
+                                for (NewbieTask newbieTask : newbieTaskList) {
+                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
+                                        taskList.add(newbieTask);
                                     } else {
-                                        if(BuildConfig.DEBUG)
-                                            G.showToast("测试：服务器数据错误,新手任务数据为空");
+                                        task = newbieTask;
                                     }
                                 }
+                                DialogNewbieTask1.showDialog(getActivity(), taskList, task);
+                            } else {
+                                if(BuildConfig.DEBUG)
+                                    G.showToast("测试：服务器数据错误,新手任务数据为空");
+                            }
+                        }
 
-                                @Override
-                                public void onError(BaseMessage baseMessage) {
-                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                }
-                            });
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        }
+                    });
 
         } else {
             newbie_task.setVisibility(View.GONE);
@@ -387,7 +400,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setViews(final List<MoreDataEntity> loginEty) {
 
-         invite(loginEty);
+        invite(loginEty);
 //        new Handler().postDelayed(new Runnable(){
 //            public void run() {
 //

app/src/main/java/com/sheep/gamegroup/model/entity/NewbieTaskRecord.java

@@ -0,0 +1,34 @@
+package com.sheep.gamegroup.model.entity;
+
+import org.xutils.db.annotation.Column;
+import org.xutils.db.annotation.Table;
+
+import java.io.Serializable;
+
+/**
+ * Created by realicing on 2018/4/20.
+ */
+@Table(name = "newbie_task_record")
+public class NewbieTaskRecord implements Serializable {
+
+    @Column(name = "id", isId = true, autoGen = true)
+    private String user_id;
+    @Column(name = "dont_show_newbie_task_dialog")
+    private boolean dontShowNewbieTaskDialog;
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public boolean isDontShowNewbieTaskDialog() {
+        return dontShowNewbieTaskDialog;
+    }
+
+    public void setDontShowNewbieTaskDialog(boolean dontShowNewbieTaskDialog) {
+        this.dontShowNewbieTaskDialog = dontShowNewbieTaskDialog;
+    }
+}

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/CommonUtil.java

@@ -17,6 +17,14 @@ import java.io.File;
  */
 
 public class CommonUtil {
+    public static String START_TASK = "开始任务";
+    public static String GET_TASK = "领取任务";
+    public static String START_PLAY = "开始试玩";
+    public static String CONTINUE_DOWNLOAD = "继续下载";
+    public static String START_DOWNLOAD = "开始下载";
+    public static String FAIL_DOWNLOAD = "下载失败";
+    public static String START_INSTALL = "开始安装";
+    public static String OPEN_APPLY = "打开应用";
     private static CommonUtil commonUtil;
 
     public static CommonUtil getInstance(){

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

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
@@ -426,9 +427,11 @@ public class Jump2View {
     /**
      * 跳转到 一分钟快速了解小绵羊 界面
      */
-    public void goUnderstandSheep(Context context, Object o){
+    public void goUnderstandSheep(Context context, NewbieTaskRecord newbieTaskRecord){
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP);
         Intent intent = new Intent(context, ActUnderstandSheep.class);
+        if(newbieTaskRecord != null)
+            intent.putExtra(NewbieTaskRecord.class.getSimpleName(), newbieTaskRecord);
         context.startActivity(intent);
     }
 

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

@@ -2,8 +2,11 @@ package com.sheep.gamegroup.util;
 
 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;
@@ -44,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);
 
         }
 
@@ -70,6 +75,12 @@ public class MyDbManager {
         }
         return userEntity;
     }
+    /**
+     * 查找NewbieTaskRecord
+     */
+    public NewbieTaskRecord dbFindNewbieTaskRecord(String invitation_code) throws DbException{
+        return db.findById(NewbieTaskRecord.class, invitation_code);
+    }
 
     /**
      * 查找指定表
@@ -101,7 +112,7 @@ public class MyDbManager {
     /**
      *保存或更新表表
      */
-    public void saveOrUpdateUser(Object o) {
+    public void saveOrUpdate(Object o) {
         try{
             db.saveOrUpdate(o);
         }catch (Exception e){

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

@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.react.SharedPreferences;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
@@ -183,6 +184,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     private  void  loginOut(){
         //登出
+
         UMConfigUtils.onProfileSignOff();
         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
         UMShareAPI api=  UMShareAPI.get(this);
@@ -291,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/ActUnderstandSheep.java

@@ -12,7 +12,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
@@ -25,6 +27,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,9 +65,10 @@ public class ActUnderstandSheep extends BaseActivity {
             @Override
             public void onClick(View view) {
                 activity.finish();
-                SharedPreferences.getInstance().putBoolean("dontShowNewbieTaskDialog", true);//设置为不再显示新手对话框
+                setDontShowNewbieTaskDialog();
             }
         });
+        newbie_task_record = (NewbieTaskRecord) getIntent().getSerializableExtra(NewbieTaskRecord.class.getSimpleName());
         final int count = BuildConfig.DEBUG ? 10 : 15;
         timer = RxjavaCountDownTimer.getInstance(count)
                 .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
@@ -81,6 +85,13 @@ public class ActUnderstandSheep extends BaseActivity {
                     }
                 }).start();
     }
+    private NewbieTaskRecord newbie_task_record;
+    private void setDontShowNewbieTaskDialog() {
+        if(newbie_task_record != null){
+            newbie_task_record.setDontShowNewbieTaskDialog(true);
+            MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
+        }
+    }
 
     @Override
     public void initListener() {
@@ -112,7 +123,7 @@ public class ActUnderstandSheep extends BaseActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        SharedPreferences.getInstance().putBoolean("dontShowNewbieTaskDialog", true);//设置为不再显示新手对话框
+        setDontShowNewbieTaskDialog();
     }
 
     @Override

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

@@ -34,6 +34,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskState;
 import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
@@ -86,9 +87,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     private List<TaskState> stateList = new ArrayList<>();//状态列表
     private TaskStateAdapter stateAdapter;
 
-    private int type;//0,开始任务 1,开始试玩 2,开始下载 3，开始安装;4,信用卡跳转
+    private int type;//0,领取任务 1,开始试玩 2,开始下载 3，开始安装;4,信用卡跳转
     private boolean isDownLoad = false;//是否下载
-    private String buttonStr = "开始任务";//是否下载
+    private String buttonStr = CommonUtil.GET_TASK;
     private Activity activity;
 
     /**
@@ -191,15 +192,20 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 开始任务或者下载游戏、试玩
      */
     private void startStask() {
-        if(task_entity.getTask_type() == 1 && (TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http"))){
-            G.showToast("下载地址错误!");
-            return;
+        DownloadTarget task = null;
+        //Todo 暂时判断信用卡，也许以后会增加其他类型，服务器传过来
+        if(task_entity.getTask_type() != 2){
+            if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
+                G.showToast("下载地址错误!");
+                return;
+            }
+            task = Aria.download(this).load(task_entity.getDownload_link());
         }
-        DownloadTarget task = Aria.download(this).load(task_entity.getDownload_link());
+
         String filePath = DIR+ File.separator+task_entity.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
         try{
             switch (type){
-                case 0://开始任务
+                case 0://领取任务
                     JSONObject object = new JSONObject();
 
                     object.put("device_id",DeviceUtil.getDeviceId(activity));
@@ -230,9 +236,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
                     if(isDownLoad){
                         if(task_entity.getTask_type() != 3){
-                            start_task_tv.setText("打开应用");
+                            start_task_tv.setText(CommonUtil.OPEN_APPLY);
                         }else {
-                            start_task_tv.setText("开始试玩");
+                            start_task_tv.setText(CommonUtil.START_PLAY);
                         }
                         type = 1;
                         toTestPlay();
@@ -246,10 +252,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         type = 2;
                     }
                     break;
-                case 4:
+                case 4://信用卡
                     Jump2View.getInstance()
                             .goHomePageView(activity, 3);
-                    finish();
+//                    finish();
                     break;
             }
         }catch (Exception e){
@@ -268,17 +274,18 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      */
     private void setBtnState(){
         type = 0;
-        if(task_entity.getRunTask() == 0){//开始任务
-            buttonStr = "开始任务";
+        if(task_entity.getRunTask() == 0){//领取任务
+            buttonStr = CommonUtil.GET_TASK;
             type = 0;
         }else if(task_entity.getTask_type() == 2){//信用卡业务
             type = 4;
-            buttonStr = "信用卡注册";
+            buttonStr = CommonUtil.START_TASK;
+            dialogItemSizeTv.setVisibility(View.INVISIBLE);
         }
         else{
             //Todo 以后整理，现在加了个type=3
             if(isDownLoad && task_entity.getTask_type() != 3){
-                buttonStr = "开始试玩";
+                buttonStr = CommonUtil.START_PLAY;;
                 type = 1;
             } else {
                 type = 2;
@@ -290,32 +297,26 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         buttonStr = task.getPercent() +"%";
                         break;
                     case IEntity.STATE_STOP:
-                        buttonStr = "继续下载";
+                        buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
                         break;
-//                    case IEntity.STATE_WAIT:
-//                        task.setFilePath(filePath);
-//                        task.start();
-//                        mDownloadTaskService.addDownloadTask(downLoadInfo);
-//                        buttonStr = task.getPercent() +"%";
-//                        break;
                     case IEntity.STATE_COMPLETE:
                         isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
                         if(isDownLoad){
-                            buttonStr = "开始试玩";
+                            buttonStr = CommonUtil.START_PLAY;
                             type = 1;
                         }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, task_entity.getPackage_names(), ""))){
-                            buttonStr = "开始安装";
+                            buttonStr = CommonUtil.START_INSTALL;
                             type = 3;
                         }else{
                             task.resetState();
-                            buttonStr = "开始下载";
+                            buttonStr = CommonUtil.START_DOWNLOAD;
                         }
                         break;
                     case IEntity.STATE_FAIL:
-                        buttonStr = "下载失败";
+                        buttonStr = CommonUtil.FAIL_DOWNLOAD;
                         break;
                     default:
-                        buttonStr = "开始下载";
+                        buttonStr = CommonUtil.START_DOWNLOAD;
                         break;
                 }
             }
@@ -407,7 +408,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Download.onTaskStop void taskStop(DownloadTask task) {
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_PAUSE);
-            start_task_tv.setText("继续下载");
+            start_task_tv.setText(CommonUtil.CONTINUE_DOWNLOAD);
         }
     }
 
@@ -424,7 +425,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Download.onTaskFail void taskFail(DownloadTask task) {
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_FAIL);
-            start_task_tv.setText("下载失败");
+            start_task_tv.setText(CommonUtil.FAIL_DOWNLOAD);
         }
     }
 
@@ -432,9 +433,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         if(task.getKey().equals(task_entity.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
             //在这里处理任务完成的状态
-            start_task_tv.setText("开始安装");
+            start_task_tv.setText(CommonUtil.START_INSTALL);
             type = 3;
-            PackageUtil.installApk(activity, task.getDownloadPath());
+//            PackageUtil.installApk(activity, task.getDownloadPath());
         }
     }
 }

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();
+                        }
+                    }
+                });
+    }
+
 }

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

@@ -9,14 +9,16 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 
 
 public class DialogNewbieTaskRegistSuccess {
 
-    public static AlertDialog showDialog(final Activity activity) {
+    public static AlertDialog showDialog(final Activity activity, final NewbieTaskRecord newbie_task_record) {
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG);
         View view = View.inflate(activity, R.layout.dialog_newbie_task_1, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
@@ -30,17 +32,19 @@ public class DialogNewbieTaskRegistSuccess {
         ViewFindUtils.find(view, R.id.dialog_sure_2).setVisibility(View.GONE);
 
         final TextView dialog_sure_1 = ViewFindUtils.find(view, R.id.dialog_sure_1);
+        dialog_sure_1.setText("了解小绵羊，领取更多奖励");
         dialog_sure_1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Jump2View.getInstance().goUnderstandSheep(activity, null);
+                Jump2View.getInstance().goUnderstandSheep(activity, newbie_task_record);
                 mAlertDialog.dismiss();
             }
         });
         mAlertDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
             public void onCancel(DialogInterface dialogInterface) {
-                SharedPreferences.getInstance().putBoolean("dontShowNewbieTaskDialog", true);//设置为不再显示新手对话框
+                newbie_task_record.setDontShowNewbieTaskDialog(true);
+                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
             }
         });
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
@@ -48,7 +52,8 @@ public class DialogNewbieTaskRegistSuccess {
             @Override
             public void onClick(View v) {
                 mAlertDialog.dismiss();
-                SharedPreferences.getInstance().putBoolean("dontShowNewbieTaskDialog", true);//设置为不再显示新手对话框
+                newbie_task_record.setDontShowNewbieTaskDialog(true);
+                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
             }
         });
         try {

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

@@ -119,7 +119,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_alignParentBottom="true">
+                    android:layout_alignParentBottom="true"
+                    android:visibility="gone">
                     <TextView
                         android:id="@+id/newbie_task_tip_tv"
                         android:layout_width="wrap_content"

datashare/build.gradle

@@ -12,7 +12,7 @@ android {
     }
 
     greendao {
-        schemaVersion 6
+        schemaVersion 7
         targetGenDir 'src/main/java'
     }
     buildTypes {

datashare/src/main/java/com/kfzs/duanduan/data/graph/provider/channel/DaoMaster.java

@@ -18,10 +18,10 @@ import com.kfzs.duanduan.datashare.provider.download.DownLoadInfoDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 6): knows all DAOs.
+ * Master of DAO (schema version 7): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 6;
+    public static final int SCHEMA_VERSION = 7;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {