数据bug修改

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

@@ -47,6 +47,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -233,6 +234,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         UMConfigUtils.onProfileSignIn();
         try {
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+            SpUtils.savePhone(activity, userEntity.getMobile());
+            SpUtils.saveWeixin(activity, userEntity.getWx_nickname());
 //            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
         } catch (Exception e) {
@@ -396,6 +399,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             if(userEntity != null){
                 refalsh();
             }
+            initData();
         } catch (Exception e) {
             e.printStackTrace();
         }

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

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

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

@@ -36,6 +36,7 @@ import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.activity.WithdrawalAct;
 import com.sheep.gamegroup.view.activity.WithdrawalListAct;
 import com.sheep.gamegroup.view.activity.WithdrawalResultAct;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 /**
  * Created by ljy on 2018/3/18.
@@ -307,11 +308,15 @@ 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;
-                }
+//            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();

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

@@ -26,13 +26,14 @@ public class MyDbManager {
     }
 
     public static MyDbManager getInstance(){
-        if (myDbManager == null){
-            synchronized (MyDbManager.class){
-                if(myDbManager == null){
-                    myDbManager = new MyDbManager();
-                }
-            }
-        }
+//        if (myDbManager == null){
+//            synchronized (MyDbManager.class){
+//                if(myDbManager == null){
+//                    myDbManager = new MyDbManager();
+//                }
+//            }
+//        }
+        myDbManager = new MyDbManager();
         return myDbManager;
     }
 
@@ -48,7 +49,7 @@ public class MyDbManager {
      * 查找表
      */
     public UserEntity dbFindUser() throws DbException{
-        List<UserEntity> users = db.findAll(UserEntity.class);
+        List<UserEntity> users = db.selector(UserEntity.class).findAll();
         UserEntity userEntity = null;
         if(users != null && users.size()>0){
             userEntity = users.get(0);

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

@@ -221,6 +221,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
             }
         });
         SpUtils.login(this, "");
+        SpUtils.saveWeixin(this, "");
+        SpUtils.savePhone(this, "");
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,"");
         finish();
@@ -259,6 +261,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 } else {
                     tvPhone.setText(entity.getMobile());
                     userEntity.setMobile(entity.getMobile());
+                    SpUtils.savePhone(activity, entity.getMobile());
                 }
 
                 Glide.with(AccountAndSecurityAct.this)
@@ -269,6 +272,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                     tvWx.setText("未绑定");
                 } else {
                     tvWx.setText(entity.getWx_nickname());
+                    SpUtils.saveWeixin(activity, entity.getWx_nickname());
                     userEntity.setWx_nickname(entity.getWx_nickname());
                 }
 

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

@@ -23,6 +23,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -118,6 +119,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             userEntity.setWx_openid("succes");
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+            SpUtils.saveWeixin(activity, "succes");
         } catch (DbException e) {
             e.printStackTrace();
         }

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

@@ -27,6 +27,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 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.xutils.ex.DbException;
@@ -82,6 +83,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     private String hitStr = "请输入手机号";
     private String noticeStr = "绑定手机号";
     private UserEntity userEntity = null;
+    String mobiles;
 
     //验证码倒计时
     private SelfCountDownTimer selfCountDownTimer;
@@ -125,11 +127,12 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         } catch (DbException e) {
             e.printStackTrace();
         }
-        if(userEntity != null && !TextUtils.isEmpty(userEntity.getMobile())){//提示
+        mobiles = SpUtils.getPhone(activity);
+        if(mobiles != null && !TextUtils.isEmpty(mobiles)){//提示
             oldOrNew = 1;
             showChangeLayout.setVisibility(View.VISIBLE);
             changePhoneLayout.setVisibility(View.GONE);
-            telTv.setText(userEntity.getMobile()+"");
+            telTv.setText(mobiles+"");
             return;
         }
         refreshData();
@@ -174,7 +177,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             hitStr = "请输入原手机号码";
             noticeStr = "验证原手机";
             phoneEtAccount.setHint(hitStr+"");
-            phoneEtAccount.setText(userEntity.getMobile()+"");
+            phoneEtAccount.setText(mobiles+"");
         }else{
             step = 0;
             hitStr = "请输入手机号码";

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

@@ -26,6 +26,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import javax.inject.Inject;
 
@@ -138,6 +139,8 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
         try {
+            SpUtils.savePhone(activity, userEntity.getMobile());
+            SpUtils.saveWeixin(activity, userEntity.getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
 //            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -144,6 +145,8 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
         userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
 
         try {
+            SpUtils.savePhone(SheepApp.mContext, userEntity.getMobile());
+            SpUtils.saveWeixin(SheepApp.mContext, userEntity.getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
 //            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");

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

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

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

@@ -79,9 +79,9 @@ public class TaskListItemAdp extends BaseAdapter {
         }
 
         final TaskAcceptedEty ety = (TaskAcceptedEty) getItem(position);
-        holder.name_tv.setText(ety.getRelease_task().getTask().getName()+"");
+        holder.name_tv.setText(ety.getRelease_task().getName()+"");
         try {
-            holder.date_tv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(ety.getRelease_task().getTask().getUpdate_time()))+"");
+            holder.date_tv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(ety.getUpdate_time()))+"");
         }catch (Exception e){
             e.printStackTrace();
         }

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

@@ -71,6 +71,30 @@ public class SpUtils {
         SharedPreferences user = context.getSharedPreferences("withdral", Context.MODE_PRIVATE);
         return user.getString("withdral_price", "");
     }
+    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", "");
+    }
 
     /**
      * 点击事件 记录

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

@@ -14,15 +14,15 @@
         android:visibility="gone"/>
     <TextView
         android:id="@+id/discount_tv"
-        android:layout_width="17dp"
-        android:layout_height="18dp"
+        android:layout_width="19dp"
+        android:layout_height="20dp"
         android:layout_toRightOf="@+id/txt_main_special_recommend_title"
         android:background="@mipmap/discount_bg_img"
         android:layout_marginLeft="@dimen/content_padding_10"
         android:text=""
         android:layout_centerInParent="true"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_size_6sp"
+        android:textSize="@dimen/text_size_8sp"
         android:gravity="center"
         android:layout_marginBottom="@dimen/content_padding_3"/>
 

app/src/main/res/values/common.xml

@@ -21,6 +21,7 @@
     <dimen name="text_size_5sp">5sp</dimen>
     <dimen name="text_size_6sp">6sp</dimen>
     <dimen name="text_size_7sp">7sp</dimen>
+    <dimen name="text_size_8sp">8sp</dimen>
     <dimen name="text_size_1">9sp</dimen>
     <dimen name="text_size_2">11sp</dimen>
     <dimen name="text_size_3">14sp</dimen>