liujiangyao лет назад: 8
Родитель
Сommit
b28990e823

+ 20 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.UserNameChange;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
@@ -240,6 +241,16 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void showTask(final UserInfoEntity entity) {
+        UserEntity userEntity = null;
+        try{
+            userEntity = MyDbManager.getInstance()
+                    .dbFindUser();
+            if(userEntity == null){
+                userEntity = new UserEntity();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
                 mEntity = entity;
                 tvName.setText(entity.getNickname());
                 tvLinkContent.setText("绵羊号:" + entity.getInvitation_code());
@@ -247,6 +258,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                     tvPhone.setText("未绑定");
                 } else {
                     tvPhone.setText(entity.getMobile());
+                    userEntity.setMobile(entity.getMobile());
                 }
 
                 Glide.with(AccountAndSecurityAct.this)
@@ -257,6 +269,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                     tvWx.setText("未绑定");
                 } else {
                     tvWx.setText(entity.getWx_nickname());
+                    userEntity.setWx_nickname(entity.getWx_nickname());
                 }
 
                 refalshAuther(entity);
@@ -266,6 +279,13 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 EventBus.getDefault().post(change);
 
 
+                //Todo user 类都没有统一,先这样
+                try{
+                    MyDbManager.getInstance()
+                            .saveOrUpdateUser(userEntity);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
 
 
     }

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

@@ -66,7 +66,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private ArrayList<Object> listData = new ArrayList<>();
     private int select;
     private String amount;
-    private int balanceAmount = 0;//余额
+    private String balanceAmount = "0";//余额
 
     @Override
     protected int getLayoutId() {
@@ -218,7 +218,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
         hideProgress();
         String balanceA =  o.getData() +"";
-        balanceAmount = TextUtils.isEmpty(balanceA)?0:Integer.valueOf(balanceA);
+        balanceAmount = TextUtils.isEmpty(balanceA)?"0":balanceA;
 
         String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));

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

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

+ 1 - 1
app/src/main/res/values/gx_strings.xml

@@ -62,7 +62,7 @@
 
     <color name="credit_blue_color">#0089ee</color>
 
-    <string name="ms_top_str">• 申请条件\n
+    <string name="ms_top_str">"• 申请条件\n
 1.申请主卡年龄要求18-60周岁;附属卡年龄要求16-65周岁;\n
 2.具有稳定的职业和收入,有良好的信用和还款能力(在校学生勿申请);\n
 3.目前只支持二代中国居民身份证进行网络申请。\n