默认值 祛除

app/src/main/AndroidManifest.xml

@@ -190,11 +190,15 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
+
+            </activity>
+
+        <activity android:name="com.sheep.gamegroup.view.activity.SplashAct">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            </activity>
+        </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"/>

app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java

@@ -8,6 +8,6 @@ import java.util.HashMap;
 
 public interface IBasePresenter {
 
-    void getTask(HashMap<String, Object> map);
+    void getTask(HashMap<String, String> map);
 
 }

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

@@ -4,6 +4,7 @@ import com.sheep.gamegroup.di.modules.ReNameModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
 import com.sheep.gamegroup.view.activity.ReNameActivity;
 
+
 import dagger.Component;
 
 /**

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

@@ -7,7 +7,7 @@ package com.sheep.gamegroup.model.entity;
 public class FriendAndAwardEntity {
 
     private   String   award;
-    private   int  frind_count;
+    private   int  friend_count;
     private  String  share_desc;
     private  String  share_link;
     private  String  share_title;
@@ -20,13 +20,7 @@ public class FriendAndAwardEntity {
         this.award = award;
     }
 
-    public int getFrind_count() {
-        return frind_count;
-    }
 
-    public void setFrind_count(int frind_count) {
-        this.frind_count = frind_count;
-    }
 
     public String getShare_desc() {
         return share_desc;
@@ -51,4 +45,12 @@ public class FriendAndAwardEntity {
     public void setShare_title(String share_title) {
         this.share_title = share_title;
     }
+
+    public int getFriend_count() {
+        return friend_count;
+    }
+
+    public void setFriend_count(int friend_count) {
+        this.friend_count = friend_count;
+    }
 }

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

@@ -1,232 +1,144 @@
-package com.sheep.gamegroup.model.entity;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
 /**
- * Created by Administrator on 2018/3/24.
+ * Copyright 2018 bejson.com
  */
+package com.sheep.gamegroup.model.entity;
 
-public class UserInfoEntity implements Parcelable{
-
-    private  String   access_token;
-
-    /**
-     * 头像
-     */
-    private  String avatar;
-    private  double   balance;
-    /**
-     *     银行卡号
-     */
-    private   String  bank_card;
-
-    private  int  create_time;
-
-    private  String  id;
-
-    /**
-     * 身份证号码
-     */
-    private  String  id_number;
-
-    /**
-     * 邀请码
-     */
-    private  String   invitation_code;
-
-    private  int  last_login_time;
-
-
-    private String    mobile;
-
-    /**
-     *     昵称
-     */
-    private  String nickname;
-
-    /**
-     * 用户唯一标识
-     */
-  private  String  open_id;
-    /**
-     *     父邀请码
-     */
-    private  String  parent_code;
-
-    /**
-     * 真实姓名
-     */
-    private  String  real_name;
-
-
-    private  String  refresh_token;
-
-
-    private  String  share_link;
-
-
-    private  double   total_asset;
-
-    private  double   total_withdraw;
-
-
-    private  int update_time;
-
-
-    private  String wx_openid;
 
+import java.io.Serializable;
 
-    protected UserInfoEntity(Parcel in) {
-        access_token = in.readString();
-        avatar = in.readString();
-        balance = in.readDouble();
-        bank_card = in.readString();
-        create_time = in.readInt();
-        id = in.readString();
-        id_number = in.readString();
-        invitation_code = in.readString();
-        last_login_time = in.readInt();
-        mobile = in.readString();
-        nickname = in.readString();
-        open_id = in.readString();
-        parent_code = in.readString();
-        real_name = in.readString();
-        refresh_token = in.readString();
-        share_link = in.readString();
-        total_asset = in.readDouble();
-        total_withdraw = in.readDouble();
-        update_time = in.readInt();
-        wx_openid = in.readString();
+/**
+ * Auto-generated: 2018-03-26 11:24:11
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class UserInfoEntity  implements Serializable {
+
+    private int id;
+    private String mobile;
+    private String nickname;
+    private int balance;
+    private String invitation_code;
+    private String parent_code;
+    private int total_asset;
+    private long last_login_time;
+    private long create_time;
+    private long update_time;
+    private String avatar;
+    private String access_token;
+    private String refresh_token;
+    private String open_id;
+    private String real_name;
+    private String id_number;
+    private String bank_card;
+    private int total_withdraw;
+    private String wx_openid;
+    private String wx_nickname;
+    private String share_link;
+
+
+    public int getId() {
+        return id;
     }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(access_token);
-        dest.writeString(avatar);
-        dest.writeDouble(balance);
-        dest.writeString(bank_card);
-        dest.writeInt(create_time);
-        dest.writeString(id);
-        dest.writeString(id_number);
-        dest.writeString(invitation_code);
-        dest.writeInt(last_login_time);
-        dest.writeString(mobile);
-        dest.writeString(nickname);
-        dest.writeString(open_id);
-        dest.writeString(parent_code);
-        dest.writeString(real_name);
-        dest.writeString(refresh_token);
-        dest.writeString(share_link);
-        dest.writeDouble(total_asset);
-        dest.writeDouble(total_withdraw);
-        dest.writeInt(update_time);
-        dest.writeString(wx_openid);
+    public void setId(int id) {
+        this.id = id;
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public String getMobile() {
+        return mobile;
     }
 
-    public static final Creator<UserInfoEntity> CREATOR = new Creator<UserInfoEntity>() {
-        @Override
-        public UserInfoEntity createFromParcel(Parcel in) {
-            return new UserInfoEntity(in);
-        }
-
-        @Override
-        public UserInfoEntity[] newArray(int size) {
-            return new UserInfoEntity[size];
-        }
-    };
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
 
-    public String getAccess_token() {
-        return access_token;
+    public String getNickname() {
+        return nickname;
     }
 
-    public void setAccess_token(String access_token) {
-        this.access_token = access_token;
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
-    public String getAvatar() {
-        return avatar;
+    public int getBalance() {
+        return balance;
     }
 
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
+    public void setBalance(int balance) {
+        this.balance = balance;
     }
 
-    public double getBalance() {
-        return balance;
+    public String getInvitation_code() {
+        return invitation_code;
     }
 
-    public void setBalance(double balance) {
-        this.balance = balance;
+    public void setInvitation_code(String invitation_code) {
+        this.invitation_code = invitation_code;
     }
 
-    public String getBank_card() {
-        return bank_card;
+    public String getParent_code() {
+        return parent_code;
     }
 
-    public void setBank_card(String bank_card) {
-        this.bank_card = bank_card;
+    public void setParent_code(String parent_code) {
+        this.parent_code = parent_code;
     }
 
-    public int getCreate_time() {
-        return create_time;
+    public int getTotal_asset() {
+        return total_asset;
     }
 
-    public void setCreate_time(int create_time) {
-        this.create_time = create_time;
+    public void setTotal_asset(int total_asset) {
+        this.total_asset = total_asset;
     }
 
-    public String getId() {
-        return id;
+    public long getLast_login_time() {
+        return last_login_time;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setLast_login_time(long last_login_time) {
+        this.last_login_time = last_login_time;
     }
 
-    public String getId_number() {
-        return id_number;
+    public long getCreate_time() {
+        return create_time;
     }
 
-    public void setId_number(String id_number) {
-        this.id_number = id_number;
+    public void setCreate_time(long create_time) {
+        this.create_time = create_time;
     }
 
-    public String getInvitation_code() {
-        return invitation_code;
+    public long getUpdate_time() {
+        return update_time;
     }
 
-    public void setInvitation_code(String invitation_code) {
-        this.invitation_code = invitation_code;
+    public void setUpdate_time(long update_time) {
+        this.update_time = update_time;
     }
 
-    public int getLast_login_time() {
-        return last_login_time;
+    public String getAvatar() {
+        return avatar;
     }
 
-    public void setLast_login_time(int last_login_time) {
-        this.last_login_time = last_login_time;
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
     }
 
-    public String getMobile() {
-        return mobile;
+    public String getAccess_token() {
+        return access_token;
     }
 
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
     }
 
-    public String getNickname() {
-        return nickname;
+    public String getRefresh_token() {
+        return refresh_token;
     }
 
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
     }
 
     public String getOpen_id() {
@@ -237,14 +149,6 @@ public class UserInfoEntity implements Parcelable{
         this.open_id = open_id;
     }
 
-    public String getParent_code() {
-        return parent_code;
-    }
-
-    public void setParent_code(String parent_code) {
-        this.parent_code = parent_code;
-    }
-
     public String getReal_name() {
         return real_name;
     }
@@ -253,51 +157,51 @@ public class UserInfoEntity implements Parcelable{
         this.real_name = real_name;
     }
 
-    public String getRefresh_token() {
-        return refresh_token;
+    public String getId_number() {
+        return id_number;
     }
 
-    public void setRefresh_token(String refresh_token) {
-        this.refresh_token = refresh_token;
+    public void setId_number(String id_number) {
+        this.id_number = id_number;
     }
 
-    public String getShare_link() {
-        return share_link;
+    public String getBank_card() {
+        return bank_card;
     }
 
-    public void setShare_link(String share_link) {
-        this.share_link = share_link;
+    public void setBank_card(String bank_card) {
+        this.bank_card = bank_card;
     }
 
-    public double getTotal_asset() {
-        return total_asset;
+    public int getTotal_withdraw() {
+        return total_withdraw;
     }
 
-    public void setTotal_asset(double total_asset) {
-        this.total_asset = total_asset;
+    public void setTotal_withdraw(int total_withdraw) {
+        this.total_withdraw = total_withdraw;
     }
 
-    public double getTotal_withdraw() {
-        return total_withdraw;
+    public String getWx_openid() {
+        return wx_openid;
     }
 
-    public void setTotal_withdraw(double total_withdraw) {
-        this.total_withdraw = total_withdraw;
+    public void setWx_openid(String wx_openid) {
+        this.wx_openid = wx_openid;
     }
 
-    public int getUpdate_time() {
-        return update_time;
+    public String getWx_nickname() {
+        return wx_nickname;
     }
 
-    public void setUpdate_time(int update_time) {
-        this.update_time = update_time;
+    public void setWx_nickname(String wx_nickname) {
+        this.wx_nickname = wx_nickname;
     }
 
-    public String getWx_openid() {
-        return wx_openid;
+    public String getShare_link() {
+        return share_link;
     }
 
-    public void setWx_openid(String wx_openid) {
-        this.wx_openid = wx_openid;
+    public void setShare_link(String share_link) {
+        this.share_link = share_link;
     }
-}
+}

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

@@ -30,7 +30,7 @@ public class AccountAndSecuritPresenter implements  AccountAndSecuritContract.Pr
 
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
 
 
         apiService.getInfo().subscribeOn(Schedulers.io())

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

@@ -36,7 +36,7 @@ public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
 
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
 
         apiService.FriendCountAndAward()
                 .subscribeOn(Schedulers.io())

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

@@ -30,7 +30,7 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
     }
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
         JSONObject j = new JSONObject();
         j.put("nickname",map.get("nickname"));
 

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

@@ -7,9 +7,8 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-
+import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
-
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
@@ -17,7 +16,6 @@ import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
 
@@ -53,8 +51,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     RelativeLayout rlTop;
 
     @Inject
-    AccountAndSecuritPresenter   presenter;
-    UserInfoEntity   mEntity;
+    AccountAndSecuritPresenter presenter;
+    UserInfoEntity mEntity;
 
 
     @Override
@@ -69,10 +67,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .accountAndSercuritModule(new AccountAndSercuritModule(this))
                 .build().inject(this);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "账号与安全")
-                .setTitleFinish(this);
+
 
     }
 
@@ -94,6 +89,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.rl_phone:   //跳转到绑定手机号
+
                 break;
             case R.id.rl_wx:  ////跳转到微信
                 break;
@@ -110,14 +106,12 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void NetSuccess(int code, String msg) {
-
+        showToast(msg);
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
-
-
-
+          showToast(errorMsg);
 
     }
 
@@ -131,14 +125,22 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 mEntity=entity;
                 tvName.setText(entity.getNickname());
                 tvLinkContent.setText("绵羊号:"+entity.getInvitation_code());
-                tvPhone.setText(entity.getMobile());
+                if(TextUtils.isEmpty(entity.getMobile())){
+                    tvPhone.setText("未绑定");
+                }else{
+                    tvPhone.setText(entity.getMobile());
+                }
+
+                Glide.with(AccountAndSecurityAct.this)
+                        .load(mEntity.getAvatar())
+                        .placeholder(R.mipmap.ic_launcher)
+                        .into(ivHead);
                 tvWx.setText(entity.getWx_openid());
                 boolean  isBanck=TextUtils.isEmpty(entity.getBank_card());
                 boolean  isId_number=TextUtils.isEmpty(entity.getId_number());
                 boolean  isRoalName=TextUtils.isEmpty(entity.getReal_name());
 
                 if(isBanck&&isId_number&&isRoalName){
-
                     tvAuther.setText("未认证");
                 }else if(!isBanck&&!isId_number&&!isRoalName){
                     tvAuther.setText("已认证");

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

@@ -1,11 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.graphics.Bitmap;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -13,7 +9,6 @@ import android.widget.TextView;
 
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
-
 import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
@@ -24,7 +19,6 @@ import com.sheep.gamegroup.util.StringUtils;
 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 com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -35,7 +29,6 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -60,7 +53,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     @BindView(R.id.rl_link)
     RelativeLayout rlLink;
 
-    private  FriendAndAwardEntity  mEntity;
+    private FriendAndAwardEntity mEntity;
 
     @Override
     protected int getLayoutId() {
@@ -73,10 +66,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .build()
                 .inject(this);
-
-        TitleBarUtils.getInstance()
-                .setTitle(this, "邀请赚钱")
-                .setTitleFinish(this);
     }
 
     @Override
@@ -206,7 +195,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                tvSize.setText(mEntity.getFrind_count()+"");
+                tvSize.setText(mEntity.getFriend_count()+"");
                 tvMoney.setText(mEntity.getAward());
             }
         });

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

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 
@@ -58,19 +59,23 @@ public class PersionInfoAct extends BaseActivity {
     public void initData() {
         Intent i = getIntent();
         if (i != null && i.hasExtra("info")) {
-            mEntity = i.getParcelableExtra("info");
+            mEntity = (UserInfoEntity) i.getSerializableExtra("info");
             if(mEntity!=null) {
                 tvNike.setText(mEntity.getNickname());
                 tvSheepId.setText(mEntity.getInvitation_code());
                 Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), 30, 30, null);
                 tvQr.setImageBitmap(mBitmap);
+
+                Glide.with(PersionInfoAct.this)
+                        .load(mEntity.getAvatar())
+                        .placeholder(R.mipmap.ic_launcher)
+                        .into(ivHeadRight);
             }
         }
 
     }
 
     private void showQR() {
-
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
         builder.setView(view);
@@ -92,15 +97,16 @@ public class PersionInfoAct extends BaseActivity {
 
 
     private void showHead() {
-
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
         builder.setView(view);
         final AlertDialog dialog = builder.create();
         ImageView iv = view.findViewById(R.id.iv_close);
         ImageView iv_qr = view.findViewById(R.id.iv_qr);
-        Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), G.WIDTH - 40, G.HEIGHT / 2, null);
-        iv_qr.setImageBitmap(mBitmap);
+        Glide.with(PersionInfoAct.this)
+                .load(mEntity.getAvatar())
+                .placeholder(R.mipmap.ic_launcher)
+                .into(iv_qr);
         dialog.show();
         iv.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPersonalCenterComponent;
 import com.sheep.gamegroup.di.modules.PersonalCenterModule;
@@ -22,7 +23,6 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
 
@@ -79,9 +79,6 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 .personalCenterModule(new PersonalCenterModule(this))
                 .build()
                 .inject(this);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "个人中心")
-                .setTitleFinish(this);
 
     }
 
@@ -106,13 +103,12 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 Jump2View.getInstance().goWithdrawal(activity, null);
                 break;
             case R.id.account_safe_layout:
-                Jump2View.getInstance().goAccountAndSecurit(activity, null);
+                Intent i=new  Intent(PersonalCenterAct.this,AccountAndSecurityAct.class);
+                startActivity(i);
                 break;
-            case R.id.account_task_layout://任务记录
-                Jump2View.getInstance().goTaskList2View(activity, null);
+            case R.id.account_task_layout:
                 break;
-            case R.id.account_detail_layout://提现明细
-                Jump2View.getInstance().goWithdrawallistView(activity, null);
+            case R.id.account_detail_layout:
                 break;
         }
     }

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

@@ -1,11 +1,12 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
-import android.widget.Button;
+import android.os.Bundle;
 import android.widget.EditText;
+import android.widget.TextView;
 
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
-
 import com.sheep.gamegroup.di.components.DaggerReNameComponent;
 import com.sheep.gamegroup.di.modules.ReNameModule;
 import com.sheep.gamegroup.presenter.ReNameContract;
@@ -14,24 +15,29 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.util.HashMap;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
  * Created by Administrator on 2018/3/24.
  */
 
-public class ReNameActivity extends BaseActivity implements ReNameContract.View{
+public class ReNameActivity extends BaseActivity implements ReNameContract.View {
 
 
     @BindView(R.id.et)
     EditText et;
-    @BindView(R.id.btn)
-    Button btn;
+
     @Inject
     ReNamePresenter presenter;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
+
     @Override
     protected int getLayoutId() {
         return R.layout.x_rename_act_layout;
@@ -68,12 +74,6 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View{
     }
 
 
-    @OnClick(R.id.btn)
-    public void onClick() {
-
-
-    }
-
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);
@@ -81,11 +81,20 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View{
 
     @Override
     public void NetError(int code, String errorMsg) {
-         showToast(errorMsg);
+        showToast(errorMsg);
     }
 
     @Override
     public void showTask() {
 
     }
+
+
+    @OnClick(R.id.tv_submit)
+    public void onClick() {
+        HashMap<String,String>  map=new HashMap<>();
+        map.put("nickname",et.getText().toString());
+        presenter.getTask(map);
+
+    }
 }

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

@@ -149,7 +149,7 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
     private void goMain() {
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
-            Intent intent = new Intent(activity, MainActivity.class);
+            Intent intent = new Intent(activity, com.kfzs.duanduan.ActMain.class);
             startActivity(intent);
             finish();
         } else {

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

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="15dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="10dp"
         android:id="@+id/rl_top"
         >
@@ -65,7 +65,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/x_ll_bg"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:layout_marginLeft="10dp"
     android:layout_marginRight="10dp"
     >
@@ -211,5 +211,23 @@
             android:drawablePadding="10dp"
             />
     </RelativeLayout>
+
+    <TextView
+        android:id="@+id/tv_submit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@drawable/selector_button_full_main"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_10"
+        android:text="退出登录"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
+
+
+
 </LinearLayout>
 </LinearLayout>

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

@@ -12,24 +12,31 @@
         android:layout_height="50dp"
         android:background="@drawable/x_ll_bg"
         android:layout_margin="12dp"
-        android:padding="20dp"
+        android:padding="10dp"
         android:orientation="vertical"
         >
         <EditText
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="@null"
             android:id="@+id/et"
             />
 
     </LinearLayout>
 
-    <Button
+    <TextView
+        android:id="@+id/tv_submit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="修改"
-        android:id="@+id/btn"
-        />
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="10dp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/selector_button_full_main"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_10"
+        android:text="确定"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
 
 
 </LinearLayout>

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/white_light"
+    android:background="@color/bg_gray"
     >
         <include
             layout="@layout/title"/>