用户信息相关修改

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

@@ -4,26 +4,21 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ApiKey;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import butterknife.BindView;
@@ -68,7 +63,7 @@ public class FgtFind extends BaseCompatFragment {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         //无数据时尝试获取缓存数据
-                        List<FindTag> newList = CommonUtil.getInstance().getCacheList(ApiKey.articles_tags, FindTag.class);
+                        List<FindTag> newList = DataUtil.getInstance().getCacheList(ApiKey.articles_tags, FindTag.class);
                         if(loadList(newList))
                             G.showToast(baseMessage);
                     }

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

@@ -7,15 +7,12 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
@@ -31,9 +28,9 @@ import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -300,7 +297,7 @@ public class FgtFindChild extends BaseCompatFragment {
                             @Override
                             public void onError(BaseMessage baseMessage) {
                                 //无数据时尝试获取缓存数据
-                                List<FindItem> newList = CommonUtil.getInstance().getCacheList(ApiKey.articles(type), FindItem.class);
+                                List<FindItem> newList = DataUtil.getInstance().getCacheList(ApiKey.articles(type), FindItem.class);
                                 if(loadList(newList))
                                     notifyDataSetChanged();
                             }

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

@@ -11,27 +11,21 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.AgentEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.afinal.simplecache.ACache;
 
@@ -41,13 +35,9 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_AGENT;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
@@ -76,7 +66,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     View personal_center_version_new;
     Unbinder unbinder;
 
-    private UserEntity userEntitys;
+    private UserEntity userEntity;
     private String faqUrl;
     private String agentUrl;
 
@@ -126,20 +116,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 }
             }
         });
-
-        SheepApp.getInstance().getNetComponent().getApiService().getInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        updateData(baseMessage);
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                    }
-                });
+        initUserInfo();
+        initWidget();
         String newVersionUrl = ACache.get(SheepApp.getInstance()).getAsString("version_url");
         personal_center_version_new.setVisibility(TextUtils.isEmpty(newVersionUrl) ? View.GONE : View.VISIBLE);
         String appVersionName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
@@ -148,22 +126,17 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     }
 
-    private void updateData(BaseMessage baseMessage) {
-        userEntitys = baseMessage.getData(UserEntity.class);
-        try {
-            MyDbManager.getInstance().saveOrUpdateUser(userEntitys);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void initUserInfo() {
+        userEntity = DataUtil.getInstance().getUserEntity();
         initWidget();
     }
 
     private void initWidget() {
 
-        personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", userEntitys.getBalance()));
-        ViewUtil.setText(nameTv, userEntitys.getNickname());
-        sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntitys.getInvitation_code()));
-        GlideImageLoader.setAvatar(iconImgIv, userEntitys.getAvatar(), Color.argb(128, 255, 255, 255));
+        personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", userEntity.getBalance()));
+        ViewUtil.setText(nameTv, userEntity.getNickname());
+        sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
+        GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
 
     }
 
@@ -191,7 +164,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         switch (view.getId()) {
             case R.id.icon_img_iv://图片
             case R.id.account_detail_layout://个人资料
-                Jump2View.getInstance().goPersionInfo(activity, userEntitys);
+                Jump2View.getInstance().goPersionInfo(activity, null);
                 break;
             case R.id.personalcenter_price_layout://我的资产
                 Jump2View.getInstance().goMyMoney(activity, null);
@@ -228,8 +201,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goFeedbackAct(activity);
                 break;
             case R.id.recommend_friend_layout://推荐给好友
-                if (userEntitys != null) {
-                    ViewUtil.shareLink(activity, userEntitys.getShareLink());
+                if (userEntity != null) {
+                    ViewUtil.shareLink(activity, userEntity.getShareLink());
                 }
                 USER_SHARE.onEvent();
                 break;

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

@@ -14,7 +14,6 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -23,9 +22,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
@@ -33,7 +30,6 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ReactUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.mdad.sdk.mdsdk.AdManager;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
@@ -59,18 +55,16 @@ import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.util.glide.GlideCircleTransformWithBorder;
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
 import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
@@ -328,14 +322,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
 
         //用户信息
-        userEntity = CommonUtil.getInstance().getCacheResult(ApiKey.get_info, UserEntity.class);
+        userEntity = DataUtil.getInstance().getUserEntity();
         if(userEntity == null){//onResume中从网络获取
         } else {
             loadUserInfo();
         }
 
         //实时动态
-        List<MoreDataEntity> cacheMoreDataEtyList = CommonUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
+        List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
         if(ListUtil.isEmpty(cacheMoreDataEtyList)){
             pagePresenter.getAwardDetail();
         } else {
@@ -349,15 +343,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        List<TaskAcceptedEty> cacheTaskAcceptedEtyList = CommonUtil.getInstance().getCacheList(ApiKey.new_run_task(3), TaskAcceptedEty.class);
+        List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(3), TaskAcceptedEty.class);
         if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//onResume中从网络获取
 
         } else {
+            AutoTaskListUtil.getInstance().loadList(cacheTaskAcceptedEtyList);
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, cacheTaskAcceptedEtyList), position);
             tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
             position++;
         }
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = CommonUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
+        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
         if (ListUtil.isEmpty(cacheTaskReleaseEtyList)) {//onResume中从网络获取
 
         } else {
@@ -369,7 +364,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         tryMakeMoneyAdp.notifyDataSetChanged();
 
         //公告
-        List<BulletinEnty> cacheBulletinEtyList = CommonUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
+        List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
         if(ListUtil.isEmpty(cacheBulletinEtyList)){
             homepageItemNoticeLayout.setVisibility(View.GONE);
             pagePresenter.bulletin(null);
@@ -379,7 +374,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             inviteNotice(bulletinEntyLists);
         }
         //轮播
-        List<SlideshowEty> cacheSlideshowEtyList = CommonUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
+        List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
         if(ListUtil.isEmpty(cacheSlideshowEtyList)){
             banner.setVisibility(View.GONE);
             pagePresenter.slideshow(null);
@@ -392,7 +387,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             bindBanner();
         }
         //首页list
-        List<HomeListEntity> cacheHomeListEtyList = CommonUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
+        List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
         if(ListUtil.isEmpty(cacheHomeListEtyList)){
             home_list_gridview_layout.setVisibility(View.GONE);
             pagePresenter.homeList();//首页list
@@ -436,9 +431,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 }
             }
         });
-        mInitData();
-    }
-    private void mInitData() {
         if (upview1 != null) {
             //停止滚动
             upview1.stopFlipping();
@@ -545,29 +537,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             return;
         }
         BaseMessage baseMessage = (BaseMessage) o;
-        userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+        userEntity = baseMessage.getData(UserEntity.class);
         if(userEntity == null){
             return;
         }
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                //幂动科技
-                CommonUtil.getInstance().initMiDong(activity, userEntity.getId());
-            }
-        }, 500);
-        //保存用户id信息
-        PreferenceUtils.setPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID, userEntity.getOpen_id());
-        //保存用户邀请人邀请码
-        PreferenceUtils.setPrefString(SheepApp.mContext, "invitation_code", userEntity.getParent_code());
-        try {
-            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-
-//            userEntity = MyDbManager.getInstance().dbFindUser();
-            Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DataUtil.getInstance().setUserEntity(userEntity);
         mHanderl.sendEmptyMessage(0);
         Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
     }
@@ -675,7 +649,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                setViews(loginEty);
+                invite(loginEty);
             }
         });
 
@@ -797,10 +771,29 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void onResume() {
         super.onResume();
-        if(pagePresenter != null) {
-            pagePresenter.getUserInfo();
-            recyclerInitData();//任务
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //幂动科技
+                CommonUtil.getInstance().initMiDong(activity, userEntity.getId());
+            }
+        }, 500);
+        UserEntity result = DataUtil.getInstance().getUserEntity();
+        if(result == null) {
+            CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+                @Override
+                public void call(UserEntity item) {
+                    if(item != null) {
+                        userEntity = item;
+                        loadUserInfo();
+                    }
+                }
+            });
+        } else {
+            userEntity = result;
+            loadUserInfo();
         }
+        recyclerInitData();
     }
 
     @Override
@@ -816,29 +809,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
     }
 
-    private void setViews(final List<MoreDataEntity> loginEty) {
-
-        invite(loginEty);
-//        new Handler().postDelayed(new Runnable(){
-//            public void run() {
-//
-//            }
-//        },60000*2);
-
-
-    }
-
-    private void invite(final List<MoreDataEntity> loginEty) {
+    private void invite(final List<MoreDataEntity> moreDataEntityList) {
         views.clear();
         upview1.removeAllViews();
-        for (MoreDataEntity entity : loginEty) {
+        for (MoreDataEntity entity : moreDataEntityList) {
             StringBuilder sb = new StringBuilder();
             sb.append(TimeStamp2Date(entity.getTime())).append("   ");
             sb.append(entity.getName()).append("   ");
             sb.append(entity.getDesc());
-//            LinearLayout moreView = (LinearLayout) LayoutInflater.from(activity).inflate(R.layout.x_item_view, null);
-//            TextView tv_desc = moreView.findViewById(R.id.tv_desc);
-//            tv_desc.setText(sb.toString());
             TextView moreView = (TextView) LayoutInflater.from(activity).inflate(R.layout.x_item_view, null);
             moreView.setText(sb.toString());
             views.add(moreView);
@@ -923,13 +901,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        try {
-            userEntity = MyDbManager.getInstance().dbFindUser();
-            if (userEntity != null) {
-                loadUserInfo();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        userEntity = DataUtil.getInstance().getUserEntity();
+        if (userEntity != null) {
+            loadUserInfo();
         }
     }
 

app/src/main/java/com/sheep/gamegroup/di/components/PersonalCenterComponent.java

@@ -1,17 +0,0 @@
-package com.sheep.gamegroup.di.components;
-
-import com.sheep.gamegroup.di.modules.PersonalCenterModule;
-import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.PersonalCenterAct;
-
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/3/10.
- */
-@UserScope
-@Component(modules = PersonalCenterModule.class,dependencies = NetComponent.class)
-public interface PersonalCenterComponent {
-    void inject(PersonalCenterAct personalCenterAct);
-}

app/src/main/java/com/sheep/gamegroup/di/modules/PersonalCenterModule.java

@@ -1,22 +0,0 @@
-package com.sheep.gamegroup.di.modules;
-
-import com.sheep.gamegroup.presenter.PersonalCenterContract;
-
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Created by ljy on 2018/3/10.
- */
-@Module
-public class PersonalCenterModule {
-    private PersonalCenterContract.View view;
-
-    public PersonalCenterModule(PersonalCenterContract.View view) {
-        this.view = view;
-    }
-    @Provides
-    public PersonalCenterContract.View provideView(){
-        return view;
-    }
-}

app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -4,7 +4,6 @@ import android.text.TextUtils;
 
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -66,7 +65,7 @@ public class AddPuplicParameIntercept implements Interceptor {
                     body = RequestBody.create(requestBody.contentType(), newJsonParams);
             }
         }
-        String id = SpUtils.getOpenId(SheepApp.mContext);
+        String id = SpUtils.getToken(SheepApp.mContext);
         String deviceId = DeviceUtil.getDeviceId(SheepApp.mContext);
         Request r = oldRequest.newBuilder()
                 .addHeader("Authorization", TextUtils.isEmpty(id) ? "" : id)//header 会覆盖以前的  header

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

@@ -7,16 +7,14 @@ import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ChannelContent;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import org.xutils.ex.DbException;
-
 import javax.inject.Inject;
 
 import rx.android.schedulers.AndroidSchedulers;
@@ -85,12 +83,8 @@ public class LoginPresenter implements LoginContract.Presenter {
         LoginEntity loginEty = null;
         if(baseMessage!=null){
             loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
-            SpUtils.login(SheepApp.mContext, loginEty.getToken());
-            try {
-                MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-            } catch (DbException e) {
-                e.printStackTrace();
-            }
+            SpUtils.saveToken(SheepApp.mContext, loginEty.getToken());
+            DataUtil.getInstance().setUserEntity(loginEty.getUser());
         }
         view.NetSuccess(1,"登录成功", EntityUtils.getUserCode(loginEty));
         TestUtil.saveUser(loginEty);

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

@@ -1,19 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-/**
- * Created by ljy on 2018/3/10.
- */
-
-public interface PersonalCenterContract {
-
-    interface Persenter{
-
-        void getUserInfo();
-    }
-
-    interface View {
-
-        void updateData2View(Object o);
-        void failData2View(Object o);
-    }
-}

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

@@ -1,52 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-import android.util.Log;
-
-import com.sheep.gamegroup.model.api.ApiService;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import javax.inject.Inject;
-
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by ljy on 2018/3/10.
- */
-
-public class PersonalCenterPresenter implements PersonalCenterContract.Persenter {
-    private PersonalCenterContract.View view;
-    private ApiService apiService;
-
-    @Inject
-    public PersonalCenterPresenter(PersonalCenterContract.View view, ApiService apiService) {
-        this.view = view;
-        this.apiService = apiService;
-    }
-
-    @Override
-    public void getUserInfo() {
-        String token = SpUtils.getOpenId(SheepApp.mContext);
-
-        Log.e("token---user",token+"");
-        apiService.getInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        view.failData2View(baseMessage);
-
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        view.updateData2View(baseMessage);
-
-                    }
-                });
-    }
-}

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

@@ -34,7 +34,7 @@ public class SmallSheepPresenter implements SmallSheepContract.Persenter {
 
     @Override
     public void getUserInfo() {
-        String token = SpUtils.getOpenId(SheepApp.mContext);
+        String token = SpUtils.getToken(SheepApp.mContext);
 
         Log.e("token---user",token+"");
         apiService.getInfo()

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -1,16 +1,11 @@
 package com.sheep.gamegroup.statistics;
 
-import android.text.TextUtils;
-
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.ActivityManager;
-import com.sheep.gamegroup.util.PreferenceUtils;
-import com.sheep.gamegroup.view.activity.ChangeTelAct;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -47,20 +42,13 @@ public class AppStatistics {
      * @param subString
      */
     synchronized public void sendDataToServer(int type,int subType,String subString){
-        String id = SpUtils.getOpenId(SheepApp.mContext);
-        String openid = TextUtils.isEmpty(id) ? "" : id.split("@")[0];
-        //openid要转换成int类型
-        int uid = 0;
-        if(!TextUtils.isEmpty(openid)){
-            uid = Integer.parseInt(openid);
-        }
         ApiService apiService =SheepApp.getInstance().getNetComponent().getApiService();
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("uid",uid);
+        jsonObject.put("uid",DataUtil.getInstance().getUserId());
         jsonObject.put("type",type);
         jsonObject.put("subtype",subType);
         jsonObject.put("substring",subString);
-        jsonObject.put("invitation_code",  PreferenceUtils.getPrefString(SheepApp.mContext, "invitation_code", ""));
+        jsonObject.put("invitation_code", DataUtil.getInstance().getUserParentCode());
         apiService.appEventTracking(jsonObject).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -498,9 +498,8 @@ public class CommonUtil {
                 activity.hideProgress();
             }
         });
-        SpUtils.login(activity, "");
-        SpUtils.saveWeixin(activity, "");
-        SpUtils.savePhone(activity, "");
+        SpUtils.saveToken(activity, "");
+        DataUtil.getInstance().clearData();
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(activity,"");
 
@@ -573,11 +572,7 @@ public class CommonUtil {
                         if(userEntity == null){
                             return;
                         }
-                        try {
-                            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                        DataUtil.getInstance().setUserEntity(userEntity);
                     }
                 });
     }
@@ -1038,11 +1033,7 @@ public class CommonUtil {
                     public void onNext(BaseMessage baseMessage) {
                         UserEntity userEntity = baseMessage.getData(UserEntity.class);
                         if (userEntity != null) {
-                            try {
-                                MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
+                            DataUtil.getInstance().setUserEntity(userEntity);
                         }
                         if (action1 != null)
                             action1.call(userEntity);
@@ -1434,56 +1425,6 @@ public class CommonUtil {
 
     }
 
-    public <T> T getCacheResult(String key, Class<T> classT) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
-        if (!TextUtils.isEmpty(cacheData)) {
-            if (BuildConfig.XXTEA_ENCRYPT) {
-                cacheData = BaseMessageConverter.decrypt(cacheData);
-            }
-            return JSON.parseObject(cacheData, BaseMessage.class).getData(classT);
-        }
-        return null;
-    }
-    public void resetCacheTime(String key, int saveTime) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key;
-        String cacheData = aCache.getAsString(realKey);
-        if (!TextUtils.isEmpty(cacheData)) {
-            aCache.put(realKey, cacheData, saveTime);
-        }
-    }
-
-    public <T> List<T> getCacheList(String key, Class<T> classT) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
-        if (!TextUtils.isEmpty(cacheData)) {
-            if (BuildConfig.XXTEA_ENCRYPT) {
-                cacheData = BaseMessageConverter.decrypt(cacheData);
-            }
-            return JSON.parseObject(cacheData, BaseMessage.class).getDataList(classT);
-        }
-        return null;
-    }
-
-    /**
-     * 设置缓存数据的时间
-     * @param key
-     */
-    public void setSaveTime(String key) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        aCache.put(key + "saveTime", String.valueOf(System.currentTimeMillis()));
-    }
-
-    /**
-     * 获取缓存数据的时间
-     * @param key
-     * @return
-     */
-    public long getSaveTime(String key) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        return NumberFormatUtils.parseLong(aCache.getAsString(key + "saveTime"));
-    }
     //设置无数据显示
     public void updateEmptyView(View empty_view, boolean showEmpty) {
         if(showEmpty) {

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

@@ -0,0 +1,200 @@
+package com.sheep.gamegroup.util;
+
+import android.text.TextUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.sheep.gamegroup.model.api.BaseMessageConverter;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import org.afinal.simplecache.ACache;
+import org.afinal.simplecache.ApiKey;
+
+import java.util.List;
+
+/**
+ * Created by realicing on 2018/7/27.
+ * realicing@sina.com
+ */
+public class DataUtil {
+    private static DataUtil instance = new DataUtil();
+
+    private DataUtil(){
+        userEntity = getCacheResult(ApiKey.get_info, UserEntity.class);//先从缓存中初始化用户信息
+        String id = SpUtils.getToken(SheepApp.mContext);
+        String uid = TextUtils.isEmpty(id) ? "" : id.split("@")[0];
+        if(userEntity != null && !TextUtils.equals(userEntity.getId(), uid)){//当前用户id与缓存的用户信息不符时，清除缓存
+            clearData();
+        }
+
+    }
+    public static DataUtil getInstance(){
+        if(instance == null){
+            instance = new DataUtil();
+        }
+        return instance;
+    }
+    /**
+     * 清除数据
+     */
+    public void clearData() {
+        userEntity = null;
+        clearCache(ApiKey.get_info);//清除用户信息的缓存
+    }
+
+    //-----------------------------------------用户信息部分-----------------------------------------------------开始
+    private UserEntity userEntity;
+
+    public static void setInstance(DataUtil instance) {
+        DataUtil.instance = instance;
+    }
+
+    public UserEntity getUserEntity() {
+        return userEntity;
+    }
+
+    public void setUserEntity(UserEntity userEntity) {
+        this.userEntity = userEntity;
+    }
+
+    /**
+     * 获取当前用户的邀请码
+     * @return
+     */
+    public String getInvitationCode() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getInvitation_code() != null)
+            return userEntity.getInvitation_code();
+        return "";
+    }
+
+    /**
+     * 获取当前用户的id
+     * @return
+     */
+    public String getUserId() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getId() != null)
+            return userEntity.getId();
+        return "";
+    }
+
+    /**
+     * 获取当前用户的邀请人的邀请码
+     * @return
+     */
+    public String getUserParentCode() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getParent_code() != null)
+            return userEntity.getParent_code();
+        return "";
+    }
+
+    /**
+     * 获取当前用户的手机号
+     * @return
+     */
+    public String getUserMobile() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getMobile() != null)
+            return userEntity.getMobile();
+        return "";
+    }
+    public void setUserMobile(String mobile) {
+        if(userEntity != null)
+            userEntity.setMobile(mobile);
+    }
+    /**
+     * 获取当前用户的微信id
+     * @return
+     */
+    public String getUserWxOpenId() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getWx_openid() != null)
+            return userEntity.getWx_openid();
+        return "";
+    }
+    /**
+     * 获取当前用户的微信昵称
+     * @return
+     */
+    public String getUserWxNicknName() {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null && userEntity.getWx_nickname() != null)
+            return userEntity.getWx_nickname();
+        return "";
+    }
+    public void setUserWxNickName(String wx_nickname) {
+        if(userEntity != null)
+            userEntity.setWx_nickname(wx_nickname);
+
+    }
+
+    //-----------------------------------------用户信息部分-----------------------------------------------------结束
+
+    //-----------------------------------------缓存数据部分-----------------------------------------------------开始
+    public <T> T getCacheResult(String key, Class<T> classT) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
+        if (!TextUtils.isEmpty(cacheData)) {
+            if (BuildConfig.XXTEA_ENCRYPT) {
+                cacheData = BaseMessageConverter.decrypt(cacheData);
+            }
+            return JSON.parseObject(cacheData, BaseMessage.class).getData(classT);
+        }
+        return null;
+    }
+    public void resetCacheTime(String key, int saveTime) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key;
+        String cacheData = aCache.getAsString(realKey);
+        if (!TextUtils.isEmpty(cacheData)) {
+            aCache.put(realKey, cacheData, saveTime);
+        }
+    }
+
+    public <T> List<T> getCacheList(String key, Class<T> classT) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
+        if (!TextUtils.isEmpty(cacheData)) {
+            if (BuildConfig.XXTEA_ENCRYPT) {
+                cacheData = BaseMessageConverter.decrypt(cacheData);
+            }
+            return JSON.parseObject(cacheData, BaseMessage.class).getDataList(classT);
+        }
+        return null;
+    }
+
+    /**
+     * 设置缓存数据的时间
+     * @param key
+     */
+    public void setSaveTime(String key) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        aCache.put(key + "saveTime", String.valueOf(System.currentTimeMillis()));
+    }
+
+    /**
+     * 获取缓存数据的时间
+     * @param key
+     * @return
+     */
+    public long getSaveTime(String key) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        return NumberFormatUtils.parseLong(aCache.getAsString(key + "saveTime"));
+    }
+    /**
+     * 获取缓存数据的时间
+     * @param key
+     * @return
+     */
+    public void clearCache(String key) {
+        ACache aCache = ACache.get(SheepApp.getInstance());
+        aCache.remove(key);
+    }
+    //-----------------------------------------缓存数据部分-----------------------------------------------------结束
+}

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

@@ -72,8 +72,8 @@ import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
-import com.sheep.gamegroup.view.activity.PersonalInfoAct;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
+import com.sheep.gamegroup.view.activity.PersonalInfoAct;
 import com.sheep.gamegroup.view.activity.PhoneAct;
 import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
 import com.sheep.gamegroup.view.activity.RechargeAct;
@@ -160,11 +160,7 @@ public class Jump2View {
      */
     public void tryGoWithdrawal(Context context, UserEntity userEntity){
         if(userEntity == null) {
-            try {
-                userEntity = MyDbManager.getInstance().dbFindUser();
-            } catch (DbException e) {
-                e.printStackTrace();
-            }
+            userEntity = DataUtil.getInstance().getUserEntity();
         }
         if(userEntity == null){
             G.showToast(R.string.loading_data);
@@ -172,7 +168,7 @@ public class Jump2View {
         }
         if(
                 TestUtil.isTestRecharge() ||
-                !isBindWeixin(context)){
+                TextUtils.isEmpty(DataUtil.getInstance().getUserWxOpenId())){//这里认定没有微信id  为   没有绑定微信号
             goNoBindWx(context, ChangeWxOrTelAct.TYPE_RECHARGE);
             return;
         }
@@ -628,35 +624,12 @@ public class Jump2View {
 
 
     /**
-     * 是否绑定微信号
-     */
-    public boolean isBindWeixin(Context context){
-        try{
-//            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-//            if(userEntity != null){
-//                if(!TextUtils.isEmpty(userEntity.getWx_openid())){
-//                    return true;
-//                }
-//            }
-            String weix = SpUtils.getWeixin(context);
-            if(!TextUtils.isEmpty(weix)){
-                return true;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-
-    /**
      * 跳转到个人中心界面
      * @param context
      * @param o
      */
-    public void goPersionInfo(Context context, UserEntity o){
+    public void goPersionInfo(Context context, Object o){
         Intent i = new Intent(context, PersonalInfoAct.class);
-        i.putExtra("info", o);
         context.startActivity(i);
         USER_INFO.onEvent();
     }
@@ -1149,21 +1122,14 @@ public class Jump2View {
      * 重新登录
      */
     public void gotoLoginAgain() {
-        SpUtils.login(SheepApp.mContext,"");
+        SpUtils.saveToken(SheepApp.mContext,"");
+        DataUtil.getInstance().clearData();
         G.showToast("请重新登录");
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
     }
 
     public void gotoGuide(final Activity activity) {
-//        if(BuildConfig.DEBUG){
-//            checkLabel(activity, new Action1<BaseMessage>() {
-//                @Override
-//                public void call(BaseMessage baseMessage) {
-//                    gotoMain(activity);
-//                }
-//            });
-//        } else
         if(SysAppUtil.isNewSmallSheep(false)){
             Intent intent = new Intent(activity, ActGuide.class);
             activity.startActivity(intent);
@@ -1173,7 +1139,7 @@ public class Jump2View {
         }
     }
     public void gotoMain(Activity activity) {
-        String openId = SpUtils.getOpenId(SheepApp.getInstance());
+        String openId = SpUtils.getToken(SheepApp.getInstance());
         if (!TextUtils.isEmpty(openId)) {
             checkOrGoHomePage(activity);
         } else {
@@ -1390,7 +1356,7 @@ public class Jump2View {
             Object url_config1 = ACache.get(SheepApp.getInstance()).getAsObject("url_config");
             if(url_config1 instanceof JSONObject) {
                 String find_share_url = ((JSONObject) url_config1).getString(shareUrlKey);
-                String url = String.format(Locale.CHINA, "%s?authorization=%s&%s=%d&invitation_code=%s", find_share_url, SpUtils.getOpenId(activity), idName, id, MyDbManager.getInstance().dbFindValue());
+                String url = String.format(Locale.CHINA, "%s?authorization=%s&%s=%d&invitation_code=%s", find_share_url, SpUtils.getToken(activity), idName, id, DataUtil.getInstance().getInvitationCode());
                 CommonUtil.getInstance().popShare(activity, url, "all");
             }
         }catch (Exception e){

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

@@ -24,7 +24,7 @@ import java.util.Locale;
  */
 
 public class MyDbManager {
-    private static MyDbManager myDbManager;
+    private static MyDbManager myDbManager = new MyDbManager();
     private final DbManager db;
 
     private MyDbManager() {
@@ -35,14 +35,9 @@ public class MyDbManager {
     }
 
     public static MyDbManager getInstance(){
-//        if (myDbManager == null){
-//            synchronized (MyDbManager.class){
-//                if(myDbManager == null){
-//                    myDbManager = new MyDbManager();
-//                }
-//            }
-//        }
-        myDbManager = new MyDbManager();
+        if (myDbManager == null){
+            myDbManager = new MyDbManager();
+        }
         return myDbManager;
     }
 
@@ -51,14 +46,13 @@ public class MyDbManager {
      */
     public void saveOrUpdateUser(final UserEntity user) throws DbException {
         if(user != null){
+            DataUtil.getInstance().setUserEntity(user);
             deleteTable(UserEntity.class);//先清空表
             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();
                     }
@@ -70,69 +64,12 @@ public class MyDbManager {
     }
 
     /**
-     * 查找表
-     */
-    public UserEntity dbFindUser() throws DbException{
-        List<UserEntity> users = db.findAll(UserEntity.class);
-        UserEntity userEntity = null;
-        if(users != null && users.size()>0){
-            userEntity = users.get(0);
-        }
-        return userEntity;
-    }
-    /**
-     * Invitation_code
-     */
-    public String dbFindValue(){
-        try {
-            return dbFindUser().getInvitation_code();
-        } catch (DbException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-    public String dbFindId(){
-        try {
-            return dbFindUser().getId();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-    public String dbFindValueBalance(){
-        try {
-            return dbFindUser().getBalance();
-        } catch (DbException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-    public String dbFindValueToken(){
-        try {
-            return dbFindUser().getAccess_token();
-        } catch (DbException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-    /**
      * 查找NewbieTaskRecord
      */
     public NewbieTaskRecord dbFindNewbieTaskRecord(String invitation_code) throws DbException{
         return db.findById(NewbieTaskRecord.class, invitation_code);
     }
 
-    /**
-     * 查找指定表
-     */
-    public UserEntity dbFindUsers() throws DbException{
-        UserEntity users = db.findFirst(UserEntity.class);
-        if(users == null ){
-            users = new UserEntity();
-        }
-        return users;
-    }
-
 
     /**
      *保存或更新表表

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

@@ -5,7 +5,6 @@ import android.webkit.JavascriptInterface;
 
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.sheep.gamegroup.model.entity.UserEntity;
 
 /**
  * 分享js注入
@@ -26,14 +25,7 @@ public class ShareJs {
 
     @JavascriptInterface
     public String getInvitationCode(){
-        String invitationCode = "";
-        try{
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            invitationCode = userEntity.getInvitation_code();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return invitationCode;
+        return DataUtil.getInstance().getInvitationCode();
     }
     @JavascriptInterface
     public String popShare(String url, String type) {

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

@@ -5,7 +5,6 @@ import android.app.DownloadManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.location.Location;
 import android.net.Uri;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
@@ -15,7 +14,6 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.kfzs.duanduan.ActMain;
@@ -211,7 +209,7 @@ public class TestUtil {
                                 public void onClick(DialogInterface dialogInterface, int which) {
                                     Object object = ListUtil.getIndex(list, which);
                                     if(object instanceof LoginUser){
-                                        SpUtils.login(SheepApp.getInstance(), ((LoginUser) object).getToken());
+                                        SpUtils.saveToken(SheepApp.getInstance(), ((LoginUser) object).getToken());
                                         ActivityManager.getInstance().finishAllActivity();
                                         Intent intent = new Intent(SheepApp.getInstance(), ActMain.class);
                                         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -364,7 +362,7 @@ public class TestUtil {
                                 showHasInstallApkList(activity);
                                 break;
                             case "复制token":
-                                StringUtils.CopyText(SpUtils.getOpenId(activity));
+                                StringUtils.CopyText(SpUtils.getToken(activity));
                                 break;
                             case "复制imsi":
                                 StringUtils.CopyText(new DeviceUtils(activity).getIMEI());

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

@@ -28,7 +28,6 @@ import rx.schedulers.Schedulers;
 public class UMConfigUtils {
 
     public static final String LOGIN_TYPE = "sheep_login_type";
-    public static final String LOGIN_OPENID = "sheep_login_openid";
 
     //统计点击次数需要的子subtype
     public enum Event {

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

@@ -12,12 +12,10 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -32,8 +30,6 @@ import java.io.File;
 
 import okhttp3.Call;
 
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
-
 /**
  * Created by ljy on 2018/6/25.
  */
@@ -114,14 +110,7 @@ public class WebviewJs {
 
     @JavascriptInterface
     public String getInvitationCode(){
-        String invitationCode = "";
-        try{
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            invitationCode = userEntity.getInvitation_code();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return invitationCode;
+        return DataUtil.getInstance().getInvitationCode();
     }
     @JavascriptInterface
     public String popShare(String url, String type) {
@@ -130,7 +119,7 @@ public class WebviewJs {
     }
     @JavascriptInterface
     public String getHeader() {
-        return SpUtils.getOpenId(activity);
+        return SpUtils.getToken(activity);
     }
 
     @JavascriptInterface

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,19 +14,15 @@ import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -270,7 +265,7 @@ public class ActWeb extends BaseCompatActivity {
     }
 
     public static String addUrlToken(String url) {
-        return addUrl(url, "authorization", SpUtils.getOpenId(SheepApp.getInstance()));
+        return addUrl(url, "authorization", SpUtils.getToken(SheepApp.getInstance()));
     }
 
     public static String addUrl(String url, String key, String value) {
@@ -345,14 +340,7 @@ public class ActWeb extends BaseCompatActivity {
 
         @JavascriptInterface
         public String getInvitationCode(){
-            String invitationCode = "";
-            try{
-                UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-                invitationCode = userEntity.getInvitation_code();
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-            return invitationCode;
+            return DataUtil.getInstance().getInvitationCode();
         }
         @JavascriptInterface
         public String popShare(String url, String type) {
@@ -361,7 +349,7 @@ public class ActWeb extends BaseCompatActivity {
         }
         @JavascriptInterface
         public String getHeader() {
-            return SpUtils.getOpenId(ActWeb.this);
+            return SpUtils.getToken(ActWeb.this);
         }
 
         @JavascriptInterface

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.WebChromeClient;
@@ -15,9 +14,8 @@ import android.widget.TextView;
 import com.kfzs.duanduan.BaseCompatActivity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceIDUtil;
-import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.WebviewJs;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -176,17 +174,18 @@ public class ActXinwanWeb extends BaseCompatActivity {
      * https://h5.51xianwan.com/try/try_list_plus_browser.aspx?ptype=2&deviceid=8883300242xw&appid=1010&appsign=1000&keycode=07688c3e9a783b245e59311
      */
     private String assemblyData(){
+        String userId = DataUtil.getInstance().getUserId();
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append(xianWanEntity.getUrl()+"?");
         stringBuffer.append("ptype="+"2");
         stringBuffer.append("&deviceid="+ DeviceIDUtil.getimei(activity));
         stringBuffer.append("&appid="+ xianWanEntity.getAndroid().getAppid());
-        stringBuffer.append("&appsign="+ MyDbManager.getInstance().dbFindId());
+        stringBuffer.append("&appsign="+ userId);
         stringBuffer.append("&keycode="+CommonUtil.getInstance().encrypt2Md5(
                 xianWanEntity.getAndroid().getAppid()+""+
                         DeviceIDUtil.getimei(activity) +
                         2 +
-                        MyDbManager.getInstance().dbFindId() +
+                        userId +
                         xianWanEntity.getAndroid().getAppsecret()
         ));
         return stringBuffer.toString();

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

@@ -15,21 +15,17 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.gamegroup.absBase.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;
-import org.xutils.ex.DbException;
 
 import javax.inject.Inject;
 
@@ -81,13 +77,9 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
                 .bindOrChangeWeixinModule(new BindOrChangeWeixinModule(this))
                 .build()
                 .inject(this);
-        try {
-            mEntity = MyDbManager.getInstance().dbFindUser();
-        } catch (DbException e) {
-            e.printStackTrace();
-        }
+        userEntity = DataUtil.getInstance().getUserEntity();
     }
-    private UserEntity mEntity;
+    private UserEntity userEntity;
 
     @Override
     public void initListener() {
@@ -133,8 +125,8 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         if(from == ChangeWxOrTelAct.TYPE_RECHARGE){//来自充值功能,需要检查并跳转到绑定身份与银行卡信息界面
             if(
                     TestUtil.isTestRecharge() ||
-                    mEntity != null && mEntity.notCertification()){//没有实名认证
-                Jump2View.getInstance().goRealNameAuther(this, mEntity, 1);
+                    userEntity != null && userEntity.notCertification()){//没有实名认证
+                Jump2View.getInstance().goRealNameAuther(this, userEntity, 1);
             }
         }
         finish();

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

@@ -21,9 +21,9 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
@@ -33,7 +33,6 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
-import org.xutils.ex.DbException;
 
 import javax.inject.Inject;
 
@@ -152,7 +151,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             default:
                 break;
         }
-        mobiles = SpUtils.getPhone(activity);
+        mobiles = DataUtil.getInstance().getUserMobile();
         if(!TextUtils.isEmpty(mobiles)){//提示
             oldOrNew = 1;
             showChangeLayout.setVisibility(View.VISIBLE);
@@ -371,10 +370,9 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 if(selfCountDownTimer != null)
                     selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
             }else if(step == 4){
-                SpUtils.savePhone(activity,mobile);
-                G.showToast(o.getMsg()+"");
-                CommonUtil.getInstance()
-                        .getUserInfo(SheepApp.mContext);
+                DataUtil.getInstance().setUserMobile(mobile);
+                G.showToast(o);
+                CommonUtil.getInstance().updateUserInfo(null);
                 EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));
                 finish();
             }

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

@@ -11,7 +11,6 @@ import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
-import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
@@ -79,21 +78,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     }
 
 
-    private void requestPremiss() {
-//        if (Build.VERSION.SDK_INT >= 23) {
-//            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CALL_PHONE, Manifest.permission.READ_LOGS, Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.SET_DEBUG_APP, Manifest.permission.SYSTEM_ALERT_WINDOW, Manifest.permission.GET_ACCOUNTS, Manifest.permission.WRITE_APN_SETTINGS};
-//            ActivityCompat.requestPermissions(this, mPermissionList, 123);
-//        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode,
-                                           String permissions[], int[] grantResults) {
-
-
-    }
-
-
     @Override
     public void initListener() {
 
@@ -101,9 +85,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Override
     public void initData() {
-        requestPremiss();
-        ChannelContent.getInstance().initChannelContent(this);
-
 
     }
 
@@ -112,7 +93,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     private void goTelLogin() {
         LOGIN_PHONE.onEvent();
-        String openId = SpUtils.getOpenId(getApplicationContext());
+        String openId = SpUtils.getToken(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
             Jump2View.getInstance().checkPhoneOrGoHomePage(this);
             finish();

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

@@ -9,7 +9,6 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
@@ -17,20 +16,18 @@ import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.AppUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 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;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.xutils.ex.DbException;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -51,7 +48,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
 
 public class PersonalInfoAct extends AbsChooseImageActivity {
 
-    UserEntity mEntity;
+    UserEntity userEntity;
     @BindView(R.id.personal_info_name)
     TextView personal_info_name;
     @BindView(R.id.personal_info_code)
@@ -69,6 +66,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     }
 
     private Activity activity;
+
     @Override
     public void initView() {
         activity = this;
@@ -90,58 +88,51 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     TextView personal_info_wx;
     @BindView(R.id.personal_info_authentication)
     TextView personal_info_authentication;
+
     @Override
     public void initData() {
-        Intent i = getIntent();
-        if (i != null && i.hasExtra("info")) {
-            mEntity = (UserEntity) i.getSerializableExtra("info");
-            if (mEntity == null) {
-                try {
-                    mEntity = MyDbManager.getInstance().dbFindUser();
-                } catch (DbException e) {
-                    e.printStackTrace();
-                }
+        if (userEntity == null) {
+            userEntity = DataUtil.getInstance().getUserEntity();
+        }
+        if (userEntity != null) {
+            personal_info_name.setText(userEntity.getNickname());
+            personal_info_code.setText(userEntity.getInvitation_code());
+
+            Glide.with(PersonalInfoAct.this)
+                    .load(AppUtil.getQRLink(userEntity.getShareLink(), 90))
+                    .into(personal_info_qr);
+            GlideImageLoader.setAvatar(personal_info_avatar, userEntity.getAvatar());
+            //账号与安全
+
+            if (TextUtils.isEmpty(userEntity.getMobile())) {
+                personal_info_phone.setText("未绑定");
+            } else {
+                personal_info_phone.setText(userEntity.getMobile());
+                DataUtil.getInstance().setUserMobile(userEntity.getMobile());
             }
-            if(mEntity != null) {
-                personal_info_name.setText(mEntity.getNickname());
-                personal_info_code.setText(mEntity.getInvitation_code());
-
-                Glide.with(PersonalInfoAct.this)
-                        .load(AppUtil.getQRLink(mEntity.getShareLink(), 90))
-                        .into(personal_info_qr);
-                GlideImageLoader.setAvatar(personal_info_avatar, mEntity.getAvatar());
-                //账号与安全
-
-                if (TextUtils.isEmpty(mEntity.getMobile())) {
-                    personal_info_phone.setText("未绑定");
-                } else {
-                    personal_info_phone.setText(mEntity.getMobile());
-                    SpUtils.savePhone(activity, mEntity.getMobile());
-                }
 
-                if (TextUtils.isEmpty(mEntity.getWx_nickname())) {
-                    if(TextUtils.isEmpty(mEntity.getWx_openid())) {
-                        personal_info_wx.setText("未绑定");
-                    } else {
-                        personal_info_wx.setText("");
-                    }
+            if (TextUtils.isEmpty(userEntity.getWx_nickname())) {
+                if (TextUtils.isEmpty(userEntity.getWx_openid())) {
+                    personal_info_wx.setText("未绑定");
                 } else {
-                    personal_info_wx.setText(mEntity.getWx_nickname());
-                    SpUtils.saveWeixin(activity, mEntity.getWx_nickname());
+                    personal_info_wx.setText("");
                 }
-
-                refalshAuther(mEntity);
-                MoneyChange change=new MoneyChange();
-                change.setBalance(mEntity.getBalance()+"");
-                change.setTotal_asset(mEntity.getTotal_asset()+"");
+            } else {
+                personal_info_wx.setText(userEntity.getWx_nickname());
             }
+
+            refalshAuther(userEntity);
+            MoneyChange change = new MoneyChange();
+            change.setBalance(userEntity.getBalance() + "");
+            change.setTotal_asset(userEntity.getTotal_asset() + "");
         }
 
 
         EventBus.getDefault().register(this);
 
     }
-    private  void  refalshAuther(UserEntity entity ){
+
+    private void refalshAuther(UserEntity entity) {
         boolean isBanck = TextUtils.isEmpty(entity.getBank_card());
         boolean isId_number = TextUtils.isEmpty(entity.getId_number());
         boolean isRoalName = TextUtils.isEmpty(entity.getReal_name());
@@ -158,17 +149,17 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(UserNameChange done) {
-        UserEntity user = mEntity;
+        UserEntity user = userEntity;
         user.setNickname(done.getNikeName());
-        mEntity = user;
-        personal_info_name.setText(mEntity.getNickname());
+        userEntity = user;
+        personal_info_name.setText(userEntity.getNickname());
 
     }
 
 
-    @OnClick({ R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container,R.id.personal_info_phone_container, R.id.personal_info_wx_container, R.id.personal_info_authentication_container})
+    @OnClick({R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container, R.id.personal_info_phone_container, R.id.personal_info_wx_container, R.id.personal_info_authentication_container})
     public void onClick(View view) {
-        if(mEntity == null){
+        if (userEntity == null) {
             G.showToast(R.string.loading_data);
             return;
         }
@@ -179,21 +170,21 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 break;
             case R.id.personal_info_name_container:
                 Intent i = new Intent(PersonalInfoAct.this, ReNameActivity.class);
-                i.putExtra("name", mEntity.getNickname());
+                i.putExtra("name", userEntity.getNickname());
                 startActivity(i);
                 USER_INFO_NAME.onEvent();
                 break;
             case R.id.personal_info_qr_container:
-                ViewUtil.showQR(PersonalInfoAct.this, mEntity.getShareLink());
+                ViewUtil.showQR(PersonalInfoAct.this, userEntity.getShareLink());
                 break;
             case R.id.personal_info_phone_container:   //跳转到绑定手机号
                 Jump2View.getInstance().goBindPhone(activity, null);
                 BIND_PHONE.onEvent();
                 break;
             case R.id.personal_info_wx_container:  ////跳转到微信
-                if(mEntity == null){
+                if (userEntity == null) {
                     G.showToast(R.string.loading_data);
-                } else if(TextUtils.isEmpty(mEntity.getWx_openid())) {
+                } else if (TextUtils.isEmpty(userEntity.getWx_openid())) {
                     Jump2View.getInstance().goNoBindWx(activity, ChangeWxOrTelAct.TYPE_NORMAL);
                 } else {
                     G.showToast("您已经绑定微信");
@@ -201,7 +192,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 BIND_WX.onEvent();
                 break;
             case R.id.personal_info_authentication_container: ////跳转授权
-                Jump2View.getInstance().goRealNameAuther(activity, mEntity, 0);
+                Jump2View.getInstance().goRealNameAuther(activity, userEntity, 0);
                 break;
         }
     }

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

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -250,16 +251,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             e.printStackTrace();
         }
         if(loginEty != null) {
-            SpUtils.login(activity, loginEty.getToken());
-            try {
-                MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-                UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-                Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-                G.showToast("登录成功");
-//            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            SpUtils.saveToken(activity, loginEty.getToken());
+            DataUtil.getInstance().setUserEntity(loginEty.getUser());
         }
 
         Jump2View.getInstance().goHomePageView(this, EntityUtils.getUserCode(loginEty));
@@ -322,7 +315,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
 
     private void goMain(String openId) {
-        SpUtils.login(getApplicationContext(), openId);
+        SpUtils.saveToken(getApplicationContext(), openId);
         Jump2View.getInstance().goHomePageView(this, null);
         ActivityManager.getInstance().endActivity(LoginAct.class);
         finish();

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

@@ -17,6 +17,8 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.RealNameAutherContract;
 import com.sheep.gamegroup.presenter.RealNameAutherPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.StringUtils;
@@ -29,7 +31,6 @@ 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.HashMap;
 import java.util.Locale;
@@ -59,7 +60,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @BindView(R.id.et_name)
     EditText etName;
 
-    UserEntity mEntity;
+    UserEntity userEntity;
     @Inject
     RealNameAutherPresenter presenter;
 
@@ -98,44 +99,39 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         }
         showProgress();
         tvSubmit.setVisibility(View.GONE);
-        updateUserInfo(new Action1<UserEntity>() {
-            @Override
-            public void call(UserEntity userEntity) {
-                hideProgress();
-                if (mEntity != null) {
-                    if (!TextUtils.isEmpty(mEntity.getReal_name())) {
-                        etName.setText(mEntity.getReal_name());
-                        count = count + 1;
-                        etName.setEnabled(false);
-                    }
-                    if (!TextUtils.isEmpty(mEntity.getId_number())) {
-                        etIdCard.setText(mEntity.getId_number());
-                        count = count + 1;
-                        etIdCard.setEnabled(false);
-                    }
-
-                    if (!TextUtils.isEmpty(mEntity.getBank_card())) {
-                        etBank.setText(mEntity.getBank_card());
-                        count = count + 1;
-                        etBank.setEnabled(false);
-                    }
-                    if (!TextUtils.isEmpty(mEntity.getBank_card_mobile())) {
-                        et_bank_mobile.setText(mEntity.getBank_card_mobile());
-                        count = count + 1;
-                        et_bank_mobile.setEnabled(false);
-                    }
-                    if (count >= 4) {
-                        tvSubmit.setVisibility(View.GONE);
-                    } else {
-                        tvSubmit.setVisibility(View.VISIBLE);
-                        ViewUtil.showMsgDialog(RealNameAuthenAct.this, new DialogConfig().setTitle("温馨提示")
-                                .setMsg("根据国家相关法律规定，为保障线上交易活动的安全，参与互联网大额提现等资金活动时需要进行实名认证。\n完成实名认证后，再次提现将不需要进行验证。")
-                                .setMsgGravity(Gravity.START).setMsgIndent(2).setBtnLeftText("确定"));
-                    }
+        userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null){
+            if (!TextUtils.isEmpty(RealNameAuthenAct.this.userEntity.getReal_name())) {
+                etName.setText(RealNameAuthenAct.this.userEntity.getReal_name());
+                count = count + 1;
+                etName.setEnabled(false);
+            }
+            if (!TextUtils.isEmpty(RealNameAuthenAct.this.userEntity.getId_number())) {
+                etIdCard.setText(RealNameAuthenAct.this.userEntity.getId_number());
+                count = count + 1;
+                etIdCard.setEnabled(false);
+            }
 
-                }
+            if (!TextUtils.isEmpty(RealNameAuthenAct.this.userEntity.getBank_card())) {
+                etBank.setText(RealNameAuthenAct.this.userEntity.getBank_card());
+                count = count + 1;
+                etBank.setEnabled(false);
             }
-        });
+            if (!TextUtils.isEmpty(RealNameAuthenAct.this.userEntity.getBank_card_mobile())) {
+                et_bank_mobile.setText(RealNameAuthenAct.this.userEntity.getBank_card_mobile());
+                count = count + 1;
+                et_bank_mobile.setEnabled(false);
+            }
+            if (count >= 4) {
+                tvSubmit.setVisibility(View.GONE);
+            } else {
+                tvSubmit.setVisibility(View.VISIBLE);
+                ViewUtil.showMsgDialog(RealNameAuthenAct.this, new DialogConfig().setTitle("温馨提示")
+                        .setMsg("根据国家相关法律规定，为保障线上交易活动的安全，参与互联网大额提现等资金活动时需要进行实名认证。\n完成实名认证后，再次提现将不需要进行验证。")
+                        .setMsgGravity(Gravity.START).setMsgIndent(2).setBtnLeftText("确定"));
+            }
+
+        }
 
 
     }
@@ -161,8 +157,9 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         updateUserInfo(new Action1<UserEntity>() {
 
             @Override
-            public void call(UserEntity userEntity) {
-                if (userEntity != null)
+            public void call(UserEntity result) {
+                if (result != null)
+                    userEntity = result;
                     if (whereFrom == 1) {
                         Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this);
                     }
@@ -172,36 +169,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     private void updateUserInfo(final Action1<UserEntity> action1) {
-        SheepApp.get(RealNameAuthenAct.this)
-                .getNetComponent()
-                .getApiService()
-                .getInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
-                        if (action1 != null)
-                            action1.call(null);
-
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        UserEntity userEntity = baseMessage.getData(UserEntity.class);
-                        if (userEntity != null) {
-                            mEntity = userEntity;
-                            try {
-                                MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        if (action1 != null)
-                            action1.call(mEntity);
-                    }
-                });
+        CommonUtil.getInstance().updateUserInfo(action1);
     }
 
     @Override
@@ -228,14 +196,10 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     public void trySubmit() {
-        if (mEntity == null) {
-            try {
-                mEntity = MyDbManager.getInstance().dbFindUser();
-            } catch (DbException e) {
-                e.printStackTrace();
-            }
+        if (userEntity == null) {
+            userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if (mEntity == null) {
+        if (userEntity == null) {
             G.showToast(R.string.unknown_error);
             return;
         }
@@ -286,15 +250,15 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         }
         map.put("bank_card_mobile", bankCardMobile);
 
-        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA, "你已执行%d次实名认证操作", mEntity.getCertification_count()))
+        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA, "你已执行%d次实名认证操作", userEntity.getCertification_count()))
                 .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5绵羊币/次作为认证费用，请务必谨慎填写认证信息。")
                 .setMsgColor("0.5绵羊币/次", "#FF0000").setMsgIndent(2).setMsgGravity(Gravity.START)
                 .setBtnLeftText("返回修改").setBtnRightText("确认提交")
                 .setBtnRightOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        if (mEntity != null)
-                            mEntity.setCertification_count(mEntity.getCertification_count() + 1);
+                        if (userEntity != null)
+                            userEntity.setCertification_count(userEntity.getCertification_count() + 1);
                         presenter.getTask(map);
                         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION);
                     }

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

@@ -13,7 +13,6 @@ import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -22,9 +21,9 @@ import com.sheep.gamegroup.di.modules.RechargeQModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RechargeQEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.RechargeQContract;
 import com.sheep.gamegroup.presenter.RechargeQPresenter;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyGridview;
@@ -34,8 +33,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.xutils.ex.DbException;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,8 +40,6 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_QQ_PAY;
 
@@ -122,43 +117,17 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
         });
 
         tvZk.setText(getSpannableString());
-
-        try {
-            userEntity = MyDbManager.getInstance().dbFindUser();
-        } catch (DbException e) {
-            e.printStackTrace();
-        }
+        userEntity = DataUtil.getInstance().getUserEntity();
         if(userEntity != null){
             tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),userEntity.getBalance() +""));
         }else {
-            SheepApp.get(activity)
-                    .getNetComponent()
-                    .getApiService()
-                    .getInfo()
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage.getMsg() +"");
-
-                        }
-
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-                            userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
-                            if(userEntity == null){
-                                tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),"0"));
-                                return;
-                            }
-                            try {
-                                MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),userEntity.getBalance() +""));
-                        }
-                    });
+            userEntity = DataUtil.getInstance().getUserEntity();
+            if(userEntity == null){
+                tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),"0"));
+                return;
+            }
+            DataUtil.getInstance().setUserEntity(userEntity);
+            tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),userEntity.getBalance() +""));
 
         }
 

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

@@ -21,9 +21,9 @@ import com.sheep.gamegroup.model.entity.PunchAndSign;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.SignCardContract;
 import com.sheep.gamegroup.presenter.SignCardPresenter;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -264,11 +264,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     private void trySignUp() {
         UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
         if (userEntity == null) {
-            try {
-                userEntity = MyDbManager.getInstance().dbFindUser();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            userEntity = DataUtil.getInstance().getUserEntity();
         }
         if (userEntity == null || TextUtils.isEmpty(userEntity.getBalance())) {
             G.showToast(R.string.unknown_error);

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

@@ -25,13 +25,12 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -127,7 +126,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                         isLoaddingData = false;
                         sendHandlerMessages(200);
                     } else {
-                        Advertising cacheAdvertising = CommonUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
+                        Advertising cacheAdvertising = DataUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
                         if (cacheAdvertising != null) {
                             isLoaddingData = false;
                             advertising = cacheAdvertising;
@@ -143,7 +142,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                                     .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                                         @Override
                                         public void onNext(BaseMessage baseMessage) {
-                                            CommonUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
+                                            DataUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
                                             isLoaddingData = false;
                                             advertising = baseMessage.getData(Advertising.class);
                                             try {

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

@@ -8,7 +8,6 @@ import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
@@ -22,18 +21,18 @@ 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.entity.WithdrawalList;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.WithdrawalContract;
 import com.sheep.gamegroup.presenter.WithdrawalPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 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;
@@ -46,8 +45,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import rx.functions.Action1;
 
 /**
  * 提现
@@ -129,11 +127,9 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
         try {
             if (userEntity == null)
-                userEntity = MyDbManager.getInstance().dbFindUser();
+                userEntity = DataUtil.getInstance().getUserEntity();
             if(userEntity != null){
-                weixin_name_tv.setText(userEntity.getWx_nickname() +"");
-            }else {
-                weixin_name_tv.setText(SpUtils.getWeixin(activity)+"");
+                ViewUtil.setText(weixin_name_tv, userEntity.getWx_nickname());
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -260,31 +256,14 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
      */
     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();
-                        }
-                    }
-                });
+        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity result) {
+                hideProgress();
+                if(result != null)
+                    userEntity = result;
+            }
+        });
     }
 
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -11,11 +11,9 @@ import android.view.ViewGroup;
 
 import com.alibaba.fastjson.JSONArray;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
@@ -24,6 +22,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
@@ -32,7 +31,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import org.afinal.simplecache.ACache;
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -206,12 +204,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp.setIs_succession(is_succession);
 
         if(isFirstCache){
-            List<TaskAcceptedEty> cacheTaskAcceptedEtyList = CommonUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession), TaskAcceptedEty.class);
+            List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession), TaskAcceptedEty.class);
             if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//本地无数据，从网络获取
                 CommonUtil.getInstance().getRunTask(presenter,is_succession);
             } else {
                 //重新设置正在运行的任务的缓存时间
-                long saveTime = CommonUtil.getInstance().getSaveTime(TaskAcceptedEty.class.getSimpleName());
+                long saveTime = DataUtil.getInstance().getSaveTime(TaskAcceptedEty.class.getSimpleName());
                 if(saveTime > 0)
                     for (TaskAcceptedEty acceptedEty : cacheTaskAcceptedEtyList) {
                         long newEndTime = acceptedEty.getEnd_time() - (System.currentTimeMillis() - saveTime) / 1000;
@@ -300,11 +298,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
                 //重新设置正在运行的任务的缓存时间
                 long minRunTime = 3600;//最多保存一个小时
-                CommonUtil.getInstance().setSaveTime(TaskAcceptedEty.class.getSimpleName());
+                DataUtil.getInstance().setSaveTime(TaskAcceptedEty.class.getSimpleName());
                 for (TaskAcceptedEty acceptedEty : taskAcceptedEty) {
                     minRunTime = Math.min(minRunTime, acceptedEty.getEnd_time());
                 }
-                CommonUtil.getInstance().resetCacheTime(ApiKey.new_run_task(is_succession), (int) minRunTime);
+                DataUtil.getInstance().resetCacheTime(ApiKey.new_run_task(is_succession), (int) minRunTime);
 
                 acceptedEtyList = taskAcceptedEty;
                 tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
@@ -475,7 +473,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             return;
         }
         if(isFirstCache){
-            List<TaskReleaseEty> cacheTaskReleaseEtyList = CommonUtil.getInstance().getCacheList(ApiKey.release_task(type, is_succession), TaskReleaseEty.class);
+            List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, is_succession), TaskReleaseEty.class);
 
             if(ListUtil.isEmpty(cacheTaskReleaseEtyList)) {//可以领取的任务
                 isFirstCache = false;

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.di.modules.NetModule;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.AppUtil;
+import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
@@ -109,7 +110,7 @@ public class SheepApp extends BaseApplication {
             connectAddress = ConnectAddress.sheep.getDefultConnectAddress();
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initNet();
-
+            ChannelContent.getInstance().initChannelContent(this);
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -1,9 +1,7 @@
 package com.sheep.jiuyan.samllsheep.service;
 
-import android.app.ActivityManager;
 import android.app.Service;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.os.Build;
@@ -11,8 +9,6 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
-import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -20,29 +16,18 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.model.entity.AppUsage;
-import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
-import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
@@ -76,7 +61,7 @@ public class FloatService extends Service {
                         public void call(Long count) {
                             LogUtil.println("FloatService", "count", "=", count);
 
-                            if (!TextUtils.isEmpty(SpUtils.getOpenId(SheepApp.getInstance())) &&!AutoTaskListUtil.getInstance().isEmpty()) {//登录情况下并且有应用自动审核任务才会记录
+                            if (!TextUtils.isEmpty(SpUtils.getToken(SheepApp.getInstance())) &&!AutoTaskListUtil.getInstance().isEmpty()) {//登录情况下并且有应用自动审核任务才会记录
                                 if(count % 60 == 0){
                                     AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermisson(false);
                                 }

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

@@ -2,7 +2,6 @@ package com.sheep.jiuyan.samllsheep.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.text.TextUtils;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -12,18 +11,12 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 public class SpUtils {
 
-    public static boolean isLogin(Context context) {
-        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
-        String wxOpenId = user.getString("wx_openId", "");
-        return !TextUtils.isEmpty(wxOpenId);
-    }
-
-    public static String getOpenId(Context context) {
+    public static String getToken(Context context) {
         SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
         return user.getString("wx_openId", "");
     }
 
-    public static void login(Context context, String openId) {
+    public static void saveToken(Context context, String openId) {
         SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = user.edit();
         editor.putString("wx_openId", openId);
@@ -31,79 +24,6 @@ public class SpUtils {
     }
 
 
-    public static void setImagePath(Context context, String vaule) {
-        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putString("imagepath", vaule);
-        editor.apply();
-    }
-
-
-    public static String getImagePath(Context context) {
-        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
-        return user.getString("imagepath", "");
-    }
-
-
-
-
-
-    public static void saveAppToken(Context context, String vaule) {
-        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putString("apptoken", vaule);
-        editor.apply();
-    }
-
-
-    public static String getAppToken(Context context) {
-        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
-        return user.getString("apptoken", "");
-
-    }
-    public static void savePhone(Context context, String vaule) {
-        SharedPreferences user = context.getSharedPreferences("phone", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putString("phone", vaule);
-        editor.apply();
-    }
-
-
-    public static String getPhone(Context context) {
-        SharedPreferences user = context.getSharedPreferences("phone", Context.MODE_PRIVATE);
-        return user.getString("phone", "");
-    }
-    public static void saveWeixin(Context context, String vaule) {
-        SharedPreferences user = context.getSharedPreferences("weixin_name", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putString("weixin_name", vaule);
-        editor.apply();
-    }
-
-
-    public static String getWeixin(Context context) {
-        SharedPreferences user = context.getSharedPreferences("weixin_name", Context.MODE_PRIVATE);
-        return user.getString("weixin_name", "");
-    }
-
-    /**
-     * 点击事件 记录
-     * @param context
-     * @param vaule
-     */
-    public static void saveClick(Context context, boolean vaule) {
-        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putBoolean("click", vaule);
-        editor.apply();
-    }
-
-
-    public static boolean getClick(Context context) {
-        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
-        return user.getBoolean("click", false);
-    }
-
     /**
      * 点击事件 记录,是否在提示
      * @param context
@@ -160,19 +80,4 @@ public class SpUtils {
         SharedPreferences user = SheepApp.getInstance().getSharedPreferences("save_data", Context.MODE_PRIVATE);
         return user.getString("ignore_md5", "");
     }
-
-    /**
-     * 保存代理显示状态
-     * @param vaule  1:显示 0：不显示
-     */
-    public static void saveAgencyState(int vaule) {
-        SharedPreferences user = SheepApp.getInstance().getSharedPreferences("agency_state", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putInt("agency_state_value", vaule);
-        editor.apply();
-    }
-    public static int getAgencyState() {
-        SharedPreferences user = SheepApp.getInstance().getSharedPreferences("agency_state", Context.MODE_PRIVATE);
-        return user.getInt("agency_state_value", 0);
-    }
 }